Run git-commit -q (though it doesn't do much good due to its stderr abuse).

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index c436deb4da0ab7334ac087ca318ac41b2847fa72..84e7d74e58631d0b0930cceaa9722ba52f9f4473 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -335,7 +335,7 @@ sub rcs_commit ($$$;$$) { #{{{
        # git-commit(1) returns non-zero if file has not been really changed.
        # so we should ignore its exit status (hence run_or_non).
        $message = possibly_foolish_untaint($message);
-       if (run_or_non('git-commit', '-m', $message, '-i', $file)) {
+       if (run_or_non('git-commit', '-q', '-m', $message, '-i', $file)) {
                unlockwiki();
                if (length $config{gitorigin_branch}) {
                        run_or_cry('git-push', $config{gitorigin_branch});

diff --git a/debian/changelog b/debian/changelog
index 428339e70f6e273974a98b800cf2cd1e4b1dfec6..4aa2b4e389db9bac5d8969428eac81489f21697e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ ikiwiki (2.11) UNRELEASED; urgency=low
   * ikiwiki-mass-rebuild: Patch from HenrikBrixAndersen to fix order
     of permissions dropping code to work on FreeBSD.
   * ikiwiki-mass-rebuild: Don't clear PATH from the environment.
+  * Run git-commit -q (though it doesn't do much good due to its stderr
+    abuse).
 
  -- Joey Hess <joeyh@debian.org>  Thu, 25 Oct 2007 23:11:13 -0400