diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-04 13:40:15 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-04 13:41:32 +0100 |
commit | b58f7c61452fc5b8b7d70f735283ecdc1b5e8ac3 (patch) | |
tree | 2119287ac8176144bc3892e23c458f10183a9bf0 /git-debrebase | |
parent | 999fd7ad45c4a442ffe199df4e43918bc192dcb4 (diff) |
git-debrebase: New feature `scrap'
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index 98e645a..62fbf61 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1577,6 +1577,18 @@ sub cmd_conclude () { do_stitch 'quick'; } +sub cmd_scrap () { + my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info(); + fail "No ongoing git-debrebase session." unless $ffq_prev_commitish; + my $scrapping_head = get_head(); + badusage "no arguments allowed" if @ARGV; + push @deferred_updates, + "update $gdrlast $ffq_prev_commitish $git_null_obj", + "update $ffq_prev $git_null_obj $ffq_prev_commitish"; + snags_maybe_bail(); + update_head_checkout $scrapping_head, $ffq_prev_commitish, "scrap"; +} + sub make_patches_staged ($) { my ($head) = @_; # Produces the patches that would result from $head if it were |