From 2e82c5f51e1ea366709431fbed5a657aaf0e2817 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 15:27:48 +0000
Subject: [PATCH] git-debrebase: introduce $claims_to_be_breakwater (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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)
        ) {
-- 
2.30.2