diff options
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index eddbf6b..54431a7 100755 --- a/git-debrebase +++ b/git-debrebase @@ -972,6 +972,7 @@ sub record_ffq_prev_deferred () { fproblems_maybe_bail(); push @deferred_updates, "update $ffq_prev $currentval $git_null_obj"; + push @deferred_updates, "delete $drlast"; push @deferred_update_messages, "Recorded current head for preservation"; return ('deferred', undef); } @@ -1212,6 +1213,7 @@ sub cmd_stitch () { # ffq-prev is ahead of us, and the only tree changes it has # are possibly addition of things in debian/patches/. # Just wind forwards rather than making a pointless pseudomerge. + push @deferred_updates, "update $drlast $prev $git_null_obj"; update_head_checkout $old_head, $prev, "stitch (fast forward)"; return; } @@ -1221,6 +1223,7 @@ sub cmd_stitch () { 'Declare fast forward / record previous work', "[git-debrebase pseudomerge: stitch$prose]", ]; + push @deferred_updates, "update $drlast $new_head $git_null_obj"; update_head $old_head, $new_head, "stitch"; } @@ -1312,6 +1315,7 @@ sub cmd_convert_to_gbp () { }; if (defined $ffq) { push @deferred_updates, "delete $ffq"; + push @deferred_updates, "delete $drlast"; } update_head_checkout $head, $out, "convert to gbp (v0)"; print <<END or die $!; |