X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=24be35e353f1c716e9a8bfb0d1463bce9f588409;hp=f4831c3c5b6c4f1a8a23cf58a1ebfeb0c074a7ce;hb=db9a52f723ee82e8f01a8de1b7822ee98ecf7a18;hpb=bc3be36a946aeb6485259be594645c3c3d69550f

diff --git a/git-debrebase b/git-debrebase
index f4831c3c..24be35e3 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1593,6 +1593,9 @@ sub cmd_conclude () {
 }
 
 sub cmd_scrap () {
+    if (currently_rebasing()) {
+	runcmd @git, qw(rebase --abort);
+    }
     my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
     if (!$ffq_prev_commitish) {
 	fail "No ongoing git-debrebase session." unless $opt_noop_ok;