git: explicitly specify the branch to push to origin

[git.ikiwiki.info.git] / IkiWiki / Plugin / git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index f2b5f9ef98099e99f8adf23be3e19c7efbfb7468..96a9727e934812d59117ed57ea6094048399052a 100644 (file)
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -476,7 +476,7 @@ sub rcs_find_changes ($) {
        my %changed;
        my %deleted;
        my $nullsha = 0 x 40;
-       my $newrev;
+       my $newrev=$oldrev;
        while (my $ci = parse_diff_tree(\@raw_lines)) {
                $newrev=$ci->{sha1};
                foreach my $i (@{$ci->{details}}) {
@@ -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});
                }
        }