From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 25 Mar 2018 11:55:07 +0000 (+0100)
Subject: git-debrebase: stitch: check the branch is laundered
X-Git-Tag: archive/debian/5.0~96
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=2dbc429b3bc03f9a18f78f8614be74b67e945b8e

git-debrebase: stitch: check the branch is laundered

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

diff --git a/git-debrebase b/git-debrebase
index f79aef5f..01eb0eb0 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1211,9 +1211,12 @@ sub cmd_stitch () {
     if (!$prev) {
 	fail "No ffq-prev to stitch." unless $opt_noop_ok;
     }
+    my $old_head = get_head();
+
+    breakwater_of $old_head, 'unclean-stitch';
+
     push @deferred_updates, "delete $ffq_prev $prev";
 
-    my $old_head = get_head();
     if (is_fast_fwd $old_head, $prev) {
 	my $differs = get_differs $old_head, $prev;
 	unless ($differs & ~D_PAT_ADD) {
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 9ddf9390..044d1365 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -56,6 +56,8 @@ consuming ffq-prev.
 
 If there is no ffq-prev, it is an error, unless --noop-ok.
 
+It is a problem if the branch is not laundered.
+
 =item git-debrebase new-upstream-v0 <new-version> [<upstream-details>...]
 
 Rebases the delta queue