diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-04 14:05:43 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-04 14:05:43 +0100 |
commit | f4cc9bfd072ea021caf9ae97d56d29c2ed01773e (patch) | |
tree | 59b2df11e1dac5e44c8c065dd5540291017fab8b /git-debrebase | |
parent | 5a93e9272cd62a4f84d3bed67d7ce28c666dd2d4 (diff) |
git-debrebase: scrap: Make it honour --noop-ok
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 62fbf61..4046425 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1579,7 +1579,10 @@ sub cmd_conclude () { sub cmd_scrap () { my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info(); - fail "No ongoing git-debrebase session." unless $ffq_prev_commitish; + if (!$ffq_prev_commitish) { + fail "No ongoing git-debrebase session." unless $opt_noop_ok; + finish 0; + } my $scrapping_head = get_head(); badusage "no arguments allowed" if @ARGV; push @deferred_updates, |