diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:34:51 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 15:36:23 +0100 |
| commit | a79b9f2941ebacde9cdc067d042cfea1a68a6844 (patch) | |
| tree | 09c0952bee215f48089eb1b721a461d5264a42d2 | |
| parent | 75da546e42b202e22aafb7241b9819e51b1d6ea7 (diff) | |
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>
| -rwxr-xr-x | tests/tests/gdr-merge | 6 |
1 files changed, 5 insertions, 1 deletions
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 |