X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=d9b95a26850e18d0306df87f814b2a0e23cda0c4;hb=13812a8ec53bd0206a5f976af211145b3029e540;hp=f332cfd48a7a74bf62125b94566cebac4a134245;hpb=c7edc2e1f2bd904b49303de8e7800b973be5492c;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index f332cfd4..d9b95a26 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,11 +593,12 @@ 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";
 
-	$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 +619,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 +629,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;