From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 14:36:54 +0000 (+0100)
Subject: git-debrebase: merge: Avoid needlessly walking MergedBreakwaters
X-Git-Tag: archive/debian/6.7~118
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2bfdf4a69e6ae3ce6b94f0d1ac13b1cde8b5a5c6;hp=a79b9f2941ebacde9cdc067d042cfea1a68a6844;p=dgit.git

git-debrebase: merge: Avoid needlessly walking MergedBreakwaters

We will not ever need to rewrite one of these, so we can just ask
keycommits for its anchor.

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

diff --git a/git-debrebase b/git-debrebase
index 9c444195..35b75cd6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1130,7 +1130,11 @@ sub walk ($;$$$) {
 		return $bomb->();
 	    }
 	    die "$ty ?";
-	} elsif ($ty eq 'VanillaMerge' or $ty eq 'MergedBreakwaters') {
+	} elsif ($ty eq 'MergedBreakwaters') {
+	    $last_anchor = mergedbreakwaters_anchor $cl;
+	    $build_start->(' MergedBreakwaters', $cur);
+	    last;
+	} elsif ($ty eq 'VanillaMerge') {
 	    # User may have merged unstitched branch(es).  We will
 	    # have now lost what ffq-prev was then (since the later
 	    # pseudomerge may introduce further changes).  The effect
@@ -1166,9 +1170,6 @@ sub walk ($;$$$) {
 
 	    printdebug "*** MERGE\n";
 
-	    # xxx avoid calling walk without nogenerate when
-	    # we have a MergedBreakwater; instead call keycommits ?
-
 	    my @bwbcmd = (@git, qw(merge-base));
 	    my @ibcmd = (@git, qw(merge-base --all));
 	    my $might_be_in_bw = 1;