From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Aug 2018 14:34:51 +0000 (+0100)
Subject: git-debrebase: merge: test suite: Use t-ref-same-start
X-Git-Tag: archive/debian/6.7~119
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=a79b9f2941ebacde9cdc067d042cfea1a68a6844;hp=75da546e42b202e22aafb7241b9819e51b1d6ea7

git-debrebase: merge: test suite: Use t-ref-same-start

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>
---

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index a213385a..07ded5a3 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -66,8 +66,12 @@ export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
 t-git-debrebase
 t-gdr-good laundered
+
+t-refs-same-start
+t-ref-head
 t-git-debrebase
-t-gdr-good laundered
+t-ref-head
+
 t-git-debrebase scrap
 
 t-some-changes after