summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2007-10-26 03:22:44 -0400
committerJoey Hess <joey@kodama.kitenet.net>2007-10-26 03:22:44 -0400
commit730a3fb4b7502fc89ee35f7d75c5b56fe8a8b8d8 (patch)
treef4eff6bc7f6b9f1057236d14dc3b637476bd426c
parent1e1e1f504609f97cad70d5dca964f8fb3cdfecaa (diff)
Run git-commit -q (though it doesn't do much good due to its stderr abuse).
-rw-r--r--IkiWiki/Rcs/git.pm2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index c436deb4d..84e7d74e5 100644
--- 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 428339e70..4aa2b4e38 100644
--- 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