git-debrebase: Provide and test "conclude"

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 524631787575bb459556a696c92850e040a8b970..636ff765cae06141f024e13b7eed023b6851a32c 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1319,10 +1319,23 @@ sub cmd_stitch () {
     do_stitch($prose);
 }
 
+sub cmd_quick () {
+    badusage "no arguments allowed" if @ARGV;
+    do_launder_head 'launder for git-debrebase quick';
+    do_stitch 'quick';
+}
+
 sub cmd_conclude () {
+    my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
+    if (!$ffq_prev_commitish) {
+       fail "No ongoing git-debrebase session." unless $opt_noop_ok;
+       return;
+    }
+    my $dangling_head = get_head();
+    
     badusage "no arguments allowed" if @ARGV;
-    do_launder_head 'launder for conclude';
-    do_stitch 'conclude';
+    do_launder_head 'launder for git-debrebase quick';
+    do_stitch 'quick';
 }
 
 sub cmd_convert_from_gbp () {