git-debrebase: scrap: Make it honour --noop-ok

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index 62fbf6156c06e644fffdf17be99f4f0e7e9ea9a7..4046425e5fa92ffd66235a68e7833279af97370f 100755 (executable)
--- 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();
 
 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,
     my $scrapping_head = get_head();
     badusage "no arguments allowed" if @ARGV;
     push @deferred_updates,