git-debrebase: do not add -i in default invocation

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

diff --git a/git-debrebase b/git-debrebase
index 70808da019922f01d4fb0f77bb5748d1d7647197..50fa1bc96cfb22e169f9c27406b165047e5b1152 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -834,7 +834,6 @@ sub defaultcmd_rebase () {
     my $old = get_head();
     my ($tip,$breakwater) = walk $old;
     update_head_postlaunder $old, $tip, 'launder for rebase';
     my $old = get_head();
     my ($tip,$breakwater) = walk $old;
     update_head_postlaunder $old, $tip, 'launder for rebase';

-    @ARGV = qw(-i) unless @ARGV; # make configurable

     runcmd @git, qw(rebase), @ARGV, $breakwater;
 }
 
     runcmd @git, qw(rebase), @ARGV, $breakwater;
 }
 

diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index f5ca2a434b986106f2d2a6f1dab7f2ac94a0706f..1d74da3b54d1961983bdd06322cead0ebd6ae420 100755 (executable)
--- a/tests/tests/gdr-edits
+++ b/tests/tests/gdr-edits
@@ -11,6 +11,17 @@ cd $p
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
 
 t-git-debrebase analyse |tee ../anal.1
 cat ../anal.1
 

-: xxx
+echo >>debian/zorkmid '// debian'
+git add debian/zorkmid
+git commit -m 'DEBIAN add zorkmid'
+
+echo >>src.c '// upstream'
+git commit -a -m 'UPSTREAM edit src.c'
+
+for f in debian/zorkmid src.c; do
+       echo '// both!' >>$f
+       git add $f
+done
+git commit -m 'MIXED add boths'

 
 t-ok
 
 t-ok