chiark / gitweb /
git-debrebase: merge: test suite: Test both with and without `after'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 10:32:51 +0000 (11:32 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 10:38:39 +0000 (11:38 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-merge

index 7a6ffdb..25b2ee0 100755 (executable)
@@ -48,15 +48,16 @@ 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 -
 # xxx should consider our ffq-prev as a parent