From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 08:59:31 +0000 (+0100)
Subject: git-debrebase: merge: Detect octopi later
X-Git-Tag: archive/debian/6.7~149
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=9d98fd69e8abee17a59d27023e87215d55eb9385

git-debrebase: merge: Detect octopi later

If git-debrebase or dgit were to make an octopus merge, we should
recognise that as an unknown kind of gdr/dgit merge, not as a general
octopus merge.  This code motion leaves a spot where such a new kind
of merge could be classified.

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

diff --git a/git-debrebase b/git-debrebase
index 6c1f5d19..b015e885 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -772,9 +772,6 @@ sub classify ($) {
 			   OrigParents => \@orig_ps);
     }
 
-    if (@p > 2) {
-	return $unknown->("octopus merge");
-    }
     if (@p == 2 and
 	$r->{Msg} =~ m{^\[git-debrebase merged-breakwater.*\]$}m) {
 	# xxx ^ metadata tag needs adding to (5)
@@ -783,6 +780,9 @@ sub classify ($) {
     if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) {
 	return $unknown->("unknown kind of merge from $1");
     }
+    if (@p > 2) {
+	return $unknown->("octopus merge");
+    }
 
     if (!$ENV{GIT_DEBREBASE_EXPERIMENTAL_MERGE}) {
 	return $unknown->("general two-parent merge");