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

diff --git a/git-debrebase b/git-debrebase
index f79aef5f..55fbbd5d 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1210,10 +1210,14 @@ sub cmd_stitch () {
     my $prev = $ffq_prev && git_get_ref $ffq_prev;
     if (!$prev) {
 	fail "No ffq-prev to stitch." unless $opt_noop_ok;
+	return;
     }
+    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) {