From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 15:20:10 +0000 (+0000)
Subject: git-debrebase: fix misdetection of breakwater declarations as other pseudomerges
X-Git-Tag: archive/debian/5.0~257
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=2358a651a8d11f2aab46a32b15fe142983ed230a

git-debrebase: fix misdetection of breakwater declarations as other pseudomerges

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

diff --git a/git-debrebase b/git-debrebase
index 87928bc5..bc92cfab 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -405,7 +405,11 @@ sub classify ($) {
     }
 
     my @identical = grep { !$_->{Differs} } @p;
-    if (@p == 2 && @identical == 1) {
+    if (@p == 2 && @identical == 1 &&
+	$r->{Msg} !~ m{^\[git-debrebase breakwater.*\]$}m
+	# breakwater merges can look like pseudomerges, if they are
+	# "declare" commits (ie, there are no upstream changes)
+       ) {
 	my @overwritten = grep { $_->{Differs} } @p;
 	confess "internal error $objid ?" unless @overwritten==1;
 	return $classify->(qw(Pseudomerge),