web commit by RecaiOktas: Add homepage (uses Git backend).

[git.ikiwiki.info.git] / IkiWiki / Rcs / tla.pm

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index 0f62dfa830123b2b9f77e7fc8772d0ed9a479dd6..7ce635c64028f95ddae34bdc23214fd9aced1a2b 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -10,6 +10,7 @@ package IkiWiki;
 my $tla_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/;
 
 sub quiet_system (@) {
+       # See Debian bug #385939.
        open (SAVEOUT, ">&STDOUT");
        close STDOUT;
        my $ret=system(@_);
@@ -60,7 +61,7 @@ sub rcs_commit ($$$) { #{{{
                           "-L".possibly_foolish_untaint($message),
                           '-d', $config{srcdir}) != 0) {
                        my $conflict=readfile("$config{srcdir}/$file");
-                       if (system("tla", "undo", "--quiet", "-d", "$config{srcdir}") != 0) {
+                       if (system("tla", "undo", "-n", "--quiet", "-d", "$config{srcdir}") != 0) {
                                warn("tla undo failed\n");
                        }
                        return $conflict;