Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'
authorJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:19:39 +0000 (14:19 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 23 Feb 2014 18:19:39 +0000 (14:19 -0400)
.gitignore
IkiWiki/Plugin/git.pm

index f8991a63dcc3100130f9b575cba36a568184df6d..8528fe9bed7336175e4315f610c96a2d6880af6a 100644 (file)
@@ -9,6 +9,7 @@ ikiwiki.out
 ikiwiki-transition.out
 ikiwiki-calendar.out
 pm_to_blib
+/MYMETA.json
 /MYMETA.yml
 *.man
 /po/cover_db
index 9e67a36ee79465303b7983b9a4e44b6f7388b704..4b0e5a86d065fba816d58564dd0593209c9d3680 100644 (file)
@@ -609,7 +609,7 @@ sub rcs_commit_helper (@) {
        # So we should ignore its exit status (hence run_or_non).
        if (run_or_non('git', 'commit', '-m', $params{message}, '-q', @opts)) {
                if (length $config{gitorigin_branch}) {
-                       run_or_cry('git', 'push', $config{gitorigin_branch});
+                       run_or_cry('git', 'push', $config{gitorigin_branch}, $config{gitmaster_branch});
                }
        }