diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-10 15:27:56 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 20ffd976c0933f551e667d80737d83849f400d45 (patch) | |
tree | c7d93851c172b9d9797cffd1b43c28171c79b5ef /git-debrebase | |
parent | 3a9a1727d1499ceb465a9494ac31c87c87ae913d (diff) |
git-debrebase: insist that breakwater merges are merges
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 28cbc88..6d8091e 100755 --- a/git-debrebase +++ b/git-debrebase @@ -375,6 +375,9 @@ sub classify ($) { $r->{Msg} =~ m{^\[git-debrebase breakwater.*\]$}m; if (@p == 1) { + if ($claims_to_be_breakwater) { + return $unknown->("single-parent git-debrebase breakwater \`merge'"); + } my $d = $r->{Parents}[0]{Differs}; if ($d == D_PAT_ADD) { return $classify->(qw(AddPatches)); |