summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c7edc2e)
We are going to make some of this into its own sub, and copying the
convenience functions seems annoying, so do this.
NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
printdebug "merge_series series gbp pq import\n";
printdebug "merge_series series gbp pq import\n";
- $attempt_cmd->(qw(gbp pq import));
+ merge_attempt_cmd($wrecknotes, qw(gbp pq import));
# OK now we are on patch-queue/merge, and we need to rebase
# onto the intended parent and drop the patches from each one
# OK now we are on patch-queue/merge, and we need to rebase
# onto the intended parent and drop the patches from each one
$build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
}
$result = $build;
$build = cmdoutput @git, qw(hash-object -w -t commit ../mcommit);
}
$result = $build;
- $mwrecknote->('merged-result', $result);
+ mwrecknote($wrecknotes, 'merged-result', $result);
runcmd @git, qw(update-ref refs/heads/result), $result;
runcmd @git, qw(update-ref refs/heads/result), $result;
runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
my $mdebug = git_rev_parse 'HEAD';
printdebug sprintf "merge_series done debug=%s\n", $mdebug;
runcmd @git, qw(commit --allow-empty -q -m M-WORKTREE);
my $mdebug = git_rev_parse 'HEAD';
printdebug sprintf "merge_series done debug=%s\n", $mdebug;
- $mwrecknote->('merged-debug', $mdebug);
+ mwrecknote($wrecknotes, 'merged-debug', $mdebug);
};
printdebug "merge_series returns $result\n";
return $result;
};
printdebug "merge_series returns $result\n";
return $result;