X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=748b49bc2bc34c644bb06d357325789eb808513c;hb=deb725236dab7d80249e72e871d069be25a607f8;hp=599fe150d12cdbae0038183976cc1f4f594b1b62;hpb=e221ca98a0eb6ad2601f58002e0abdb0ea4f7374;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 599fe150..748b49bc 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -32,12 +32,14 @@ use Dpkg::Version;
 use File::FnMatch qw(:fnmatch);
 
 our ($opt_force, $opt_noop_ok, @opt_anchors);
+our ($opt_defaultcmd_interactive);
 
 our $us = qw(git-debrebase);
 
 sub badusage ($) {
     my ($m) = @_;
-    die "bad usage: $m\n";
+    print STDERR "bad usage: $m\n";
+    exit 12;
 }
 
 sub cfg ($;$) {
@@ -905,6 +907,7 @@ sub cmd_launder_v0 () {
 }
 
 sub defaultcmd_rebase () {
+    push @ARGV, @{ $opt_defaultcmd_interactive // [] };
     my ($tip,$breakwater) = do_launder_head 'launder for rebase';
     runcmd @git, qw(rebase), @ARGV, $breakwater;
 }
@@ -1071,6 +1074,21 @@ sub stitch ($$$$$) {
     update_head $old_head, $new_head, "stitch: $prose";
 }
 
+sub do_stitch ($) {
+    my ($prose) = @_;
+
+    my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
+    if (!$ffq_prev_commitish) {
+	fail "No ffq-prev to stitch." unless $opt_noop_ok;
+	return;
+    }
+    my $dangling_head = get_head();
+
+    keycommits $dangling_head, \&snag, \&snag, \&snag;
+
+    stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
+}
+
 sub cmd_new_upstream_v0 () {
     # automatically and unconditionally launders before rebasing
     # if rebase --abort is used, laundering has still been done
@@ -1285,17 +1303,13 @@ sub cmd_stitch () {
     my $prose = 'stitch';
     GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
     badusage "no arguments allowed" if @ARGV;
+    do_stitch($prose);
+}
 
-    my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
-    if (!$ffq_prev_commitish) {
-	fail "No ffq-prev to stitch." unless $opt_noop_ok;
-	return;
-    }
-    my $old_head = get_head();
-
-    keycommits $old_head, \&snag, \&snag, \&snag;
-
-    stitch($old_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
+sub cmd_conclude () {
+    badusage "no arguments allowed" if @ARGV;
+    do_launder_head 'launder for conclude';
+    do_stitch 'conclude';
 }
 
 sub cmd_convert_from_gbp () {
@@ -1449,7 +1463,19 @@ GetOptions("D+" => \$debuglevel,
 	   'noop-ok', => \$opt_noop_ok,
 	   'f=s' => \@snag_force_opts,
 	   'anchor=s' => \@opt_anchors,
-	   'force!') or die badusage "bad options\n";
+	   'force!',
+	   '-i:s' => sub {
+	       my ($opt,$val) = @_;
+	       badusage "git-debrebase: no cuddling to -i for git-rebase"
+		   if length $val;
+	       die if $opt_defaultcmd_interactive; # should not happen
+	       $opt_defaultcmd_interactive = [ qw(-i) ];
+	       # This access to @ARGV is excessive familiarity with
+	       # Getopt::Long, but there isn't another sensible
+	       # approach.  '-i=s{0,}' does not work with bundling.
+	       push @$opt_defaultcmd_interactive, @ARGV;
+	       @ARGV=();
+	   }) or die badusage "bad options\n";
 initdebug('git-debrebase ');
 enabledebug if $debuglevel;
 
@@ -1460,7 +1486,7 @@ $rd = fresh_playground "$playprefix/misc";
 
 @opt_anchors = map { git_rev_parse $_ } @opt_anchors;
 
-if (!@ARGV || $ARGV[0] =~ m{^-}) {
+if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
     defaultcmd_rebase();
 } else {
     my $cmd = shift @ARGV;