diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 09:59:31 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 10:31:17 +0100 |
commit | 9d98fd69e8abee17a59d27023e87215d55eb9385 (patch) | |
tree | 8d7b58102d4048f603bba5922a8e8b3e41edfe55 | |
parent | 393232b616d2d602f5cb8a81362ddbec7ee7e9fe (diff) |
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>
-rwxr-xr-x | git-debrebase | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase index 6c1f5d1..b015e88 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"); |