From 3265f60dd2ee4fe23005f62d289f7714f329d043 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 20:19:08 +0100 Subject: 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 --- git-debrebase | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'git-debrebase') 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; -- cgit v1.2.3