From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 10:32:51 +0000 (+0100)
Subject: git-debrebase: merge: test suite: Test both with and without `after'
X-Git-Tag: archive/debian/6.7~138
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0323a891b385296fd346dd1ea794c5c2ee8229a0;ds=sidebyside

git-debrebase: merge: test suite: Test both with and without `after'

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

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 7a6ffdb6..25b2ee0a 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -48,14 +48,15 @@ t-git-debrebase quick
 
 git merge other
 
-t-some-changes after
-# xxx ^ commenting out this line produces an internal error
-
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase
 
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
+t-git-debrebase
+t-git-debrebase scrap
+
+t-some-changes after
 t-git-debrebase
 
 # xxx want to check that we DTRT if we start out unstitched -