diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-03-25 12:55:07 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:00 +0100 |
| commit | 2dbc429b3bc03f9a18f78f8614be74b67e945b8e (patch) | |
| tree | 16781922e951354af6cb825c09b44d171314a860 /git-debrebase | |
| parent | 2e4434dbec72dd4a042d2fc3beab9db88943b2c8 (diff) | |
git-debrebase: stitch: check the branch is laundered
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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) { |