From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 Feb 2014 18:19:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c1fbd66c031980f89e6b28862fe90813b1074c2e?hp=b5b8c5cecc0b5d69e4e30db6909d083a78e425ea

Merge remote-tracking branch 'remotes/smcv/ready/git-push-origin-master'
---

diff --git a/.gitignore b/.gitignore
index f8991a63d..8528fe9be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ ikiwiki.out
 ikiwiki-transition.out
 ikiwiki-calendar.out
 pm_to_blib
+/MYMETA.json
 /MYMETA.yml
 *.man
 /po/cover_db
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 9e67a36ee..4b0e5a86d 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -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});
 		}
 	}