From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 15:27:48 +0000 (+0000)
Subject: git-debrebase: introduce $claims_to_be_breakwater (nfc)
X-Git-Tag: archive/debian/5.0~255
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3a9a1727d1499ceb465a9494ac31c87c87ae913d

git-debrebase: introduce $claims_to_be_breakwater (nfc)

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

diff --git a/git-debrebase b/git-debrebase
index bc92cfab..28cbc889 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -371,6 +371,9 @@ sub classify ($) {
 	return $r;
     };
 
+    my $claims_to_be_breakwater =
+	$r->{Msg} =~ m{^\[git-debrebase breakwater.*\]$}m;
+
     if (@p == 1) {
 	my $d = $r->{Parents}[0]{Differs};
 	if ($d == D_PAT_ADD) {
@@ -405,8 +408,7 @@ sub classify ($) {
     }
 
     my @identical = grep { !$_->{Differs} } @p;
-    if (@p == 2 && @identical == 1 &&
-	$r->{Msg} !~ m{^\[git-debrebase breakwater.*\]$}m
+    if (@p == 2 && @identical == 1 && !$claims_to_be_breakwater
 	# breakwater merges can look like pseudomerges, if they are
 	# "declare" commits (ie, there are no upstream changes)
        ) {