diff options
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index f79aef5..01eb0eb 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) { |