From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 19:23:50 +0000 (+0100)
Subject: git-debrebase: merge: Use a fresh branch and check out again
X-Git-Tag: archive/debian/6.7~73
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=52d1506110771ee16b19be4c6b82e06559c9e6f5;ds=inline

git-debrebase: merge: Use a fresh branch and check out again

We are going to want this in a moment.

No overall functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index d9b95a26..18bc21f0 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -597,6 +597,7 @@ sub merge_series ($$$;@) {
 	$mwrecknote->('merged-patchqueue', $merged_pq);
 
 	printdebug "merge_series series gbp pq import\n";
+	runcmd @git, qw(checkout -q -b mergec), $merged_pq;
 
 	merge_attempt_cmd($wrecknotes, qw(gbp pq import));
 
@@ -605,7 +606,7 @@ sub merge_series ($$$;@) {
 
 	printdebug "merge_series series ok, building...\n";
 	my $build = $newbase;
-	my @lcmd = (@git, qw(rev-list --reverse merge..patch-queue/merge));
+	my @lcmd = (@git, qw(rev-list --reverse mergec..patch-queue/mergec));
 	foreach my $c (grep /./, split /\n/, cmdoutput @lcmd) {
 	    my $commit = git_cat_file $c, 'commit';
 	    printdebug "merge_series series ok, building $c\n";