X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=d9b95a26850e18d0306df87f814b2a0e23cda0c4;hp=0e365cd600c9b0224330d9a586b0605c8a39ae94;hb=13812a8ec53bd0206a5f976af211145b3029e540;hpb=3265f60dd2ee4fe23005f62d289f7714f329d043 diff --git a/git-debrebase b/git-debrebase index 0e365cd6..d9b95a26 100755 --- a/git-debrebase +++ b/git-debrebase @@ -453,6 +453,7 @@ sub merge_series ($$$;@) { # $prereq{} 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";