diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-10 15:27:48 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 3a9a1727d1499ceb465a9494ac31c87c87ae913d (patch) | |
tree | 62f10cef6abec24d6c16419d1124c1dcc025c281 /git-debrebase | |
parent | 16bb4f404fe0c9816719adce36b15daaac5dc451 (diff) |
git-debrebase: introduce $claims_to_be_breakwater (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-debrebase b/git-debrebase index bc92cfa..28cbc88 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) ) { |