diff options
| -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, |