diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-10 15:20:10 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 2358a651a8d11f2aab46a32b15fe142983ed230a (patch) | |
tree | 6d21afa6056b877f6e0ae049878ef5dbd53dc34a /git-debrebase | |
parent | 1f4480c7fe42d8e997db608c35a3500de1052528 (diff) |
git-debrebase: fix misdetection of breakwater declarations as other pseudomerges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 87928bc..bc92cfa 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), |