From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Feb 2018 19:29:00 +0000 (+0000)
Subject: git-debrebase: do not add -i in default invocation
X-Git-Tag: archive/debian/5.0~224
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=237fe933713ea3d86ed8fbdb86819797b770405b;ds=sidebyside

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 70808da0..50fa1bc9 100755
--- 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';
-    @ARGV = qw(-i) unless @ARGV; # make configurable
     runcmd @git, qw(rebase), @ARGV, $breakwater;
 }
 
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index f5ca2a43..1d74da3b 100755
--- 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
 
-: 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