summaryrefslogtreecommitdiff
path: root/tests/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-15 19:29:00 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit237fe933713ea3d86ed8fbdb86819797b770405b (patch)
treeaebbafc836d8d6a87a5081ad39654aeac79b64c8 /tests/tests
parent762c8811ef11a8961dfac89e5a9fb7d67f8aa33d (diff)
git-debrebase: do not add -i in default invocation
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-xtests/tests/gdr-edits13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits
index f5ca2a4..1d74da3 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