chiark / gitweb /
git-debrebase: merge: test suite: Use t-ref-same-start
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:34:51 +0000 (15:34 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:36:23 +0000 (15:36 +0100)
This is better than t-gdr-good laundered because (i) it is faster (ii)
it checks that the second laundry was a no-op (and did not rewrite
unnecessarily).

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

index a213385a06de5e44af7a492fbf361d2402bf97fb..07ded5a3172bef6862d924b16ab4c76d087e4968 100755 (executable)
@@ -66,8 +66,12 @@ export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
 t-git-debrebase
 t-gdr-good laundered
 
 t-git-debrebase
 t-gdr-good laundered
+
+t-refs-same-start
+t-ref-head
 t-git-debrebase
 t-git-debrebase
-t-gdr-good laundered
+t-ref-head
+
 t-git-debrebase scrap
 
 t-some-changes after
 t-git-debrebase scrap
 
 t-some-changes after