diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:19:08 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:19:08 +0100 |
commit | 3265f60dd2ee4fe23005f62d289f7714f329d043 (patch) | |
tree | 6d3221b362d8710fd89922b0ce626f8b8c843b8b | |
parent | c7edc2e1f2bd904b49303de8e7800b973be5492c (diff) |
git-debrebase: merge: Use a couple of globals instead
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>
-rwxr-xr-x | git-debrebase | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index f332cfd..0e365cd 100755 --- a/git-debrebase +++ b/git-debrebase @@ -596,7 +596,7 @@ sub merge_series ($$$;@) { 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 @@ -617,7 +617,7 @@ sub merge_series ($$$;@) { $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; @@ -627,7 +627,7 @@ sub merge_series ($$$;@) { 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; |