From a79b9f2941ebacde9cdc067d042cfea1a68a6844 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 15:34:51 +0100 Subject: 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 --- tests/tests/gdr-merge | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index a213385..07ded5a 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 -- cgit v1.2.3