X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=01eb0eb0e95c349fc0f96553286be7e3f9f031d6;hp=f79aef5ff2241478bb98e452fe134d30492208a1;hb=2dbc429b3bc03f9a18f78f8614be74b67e945b8e;hpb=2e4434dbec72dd4a042d2fc3beab9db88943b2c8

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) {