aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2014-02-21 11:23:17 +0000
committerSimon McVittie <smcv@debian.org>2014-02-21 16:39:17 +0000
commitbe3483fe9be559a62dd88577b3a374d55b7262f3 (patch)
treeaf7e515678470fa594229ae321f9355d4ab5df78 /IkiWiki
parent5e741c434d72218f1608876d23b2ccd321955e11 (diff)
downloadikiwiki-be3483fe9be559a62dd88577b3a374d55b7262f3.tar
ikiwiki-be3483fe9be559a62dd88577b3a374d55b7262f3.tar.gz
git: explicitly specify the branch to push to origin
git's behaviour when doing "git push origin" is configurable, and the default is going to change in 2.0. In particular, if you've set push.default to "nothing", the regression test will warn: fatal: You didn't specify any refspecs to push, and push.default is "nothing". 'git push origin' failed: at .../lib/IkiWiki/Plugin/git.pm line 220.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/git.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 77c0678bc..96a9727e9 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});
}
}