diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:20:49 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:20:49 +0100 |
commit | 13812a8ec53bd0206a5f976af211145b3029e540 (patch) | |
tree | 76e912479282170334cdfa6395fc486f4417f9a6 /git-debrebase | |
parent | 3265f60dd2ee4fe23005f62d289f7714f329d043 (diff) |
git-debrebase: merge: Introduce $merged_pq
We are going to want this in a moment.
NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 0e365cd..d9b95a2 100755 --- a/git-debrebase +++ b/git-debrebase @@ -453,6 +453,7 @@ sub merge_series ($$$;@) { # $prereq{<patch filename>} exists or not (even later) my $result; + my $merged_pq; my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); }; @@ -592,7 +593,8 @@ sub merge_series ($$$;@) { runcmd @git, qw(add), $seriesfile; runcmd @git, qw(commit --quiet -m), 'Merged patch queue form'; - $mwrecknote->('merged-patchqueue', git_rev_parse 'HEAD'); + $merged_pq = git_rev_parse 'HEAD'; + $mwrecknote->('merged-patchqueue', $merged_pq); printdebug "merge_series series gbp pq import\n"; |