From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 4 Aug 2018 13:05:43 +0000 (+0100)
Subject: git-debrebase: scrap: Make it honour --noop-ok
X-Git-Tag: archive/debian/6.5~6
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f4cc9bfd072ea021caf9ae97d56d29c2ed01773e;ds=sidebyside

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 62fbf615..4046425e 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,