X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cadfac387cd2a206a195d4e425536163a5a9a333..2a6e353c205a6c2c8b8e2eaf85fe9c585c1af0cd:/IkiWiki/Rcs/git.pm?ds=sidebyside diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm index 8f75399f8..84e7d74e5 100644 --- a/IkiWiki/Rcs/git.pm +++ b/IkiWiki/Rcs/git.pm @@ -285,7 +285,9 @@ sub git_sha1 (;$) { #{{{ sub rcs_update () { #{{{ # Update working directory. - run_or_cry('git-pull', $config{gitorigin_branch}); + if (length $config{gitorigin_branch}) { + run_or_cry('git-pull', $config{gitorigin_branch}); + } } #}}} sub rcs_prepedit ($) { #{{{ @@ -333,9 +335,11 @@ 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(); - run_or_cry('git-push', $config{gitorigin_branch}); + if (length $config{gitorigin_branch}) { + run_or_cry('git-push', $config{gitorigin_branch}); + } } return undef; # success