diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-15 07:48:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-15 07:48:01 +0300 |
| commit | 5b900fb812f678183d2810427b8862eb7f0dc22b (patch) | |
| tree | d5d98738de8e385869bae82143f47f4793200150 /t/test-lib-functions.sh | |
| parent | 16d9d7184bbf39e8c1c9c4756805278f530be30f (diff) | |
| parent | 11c21f22ded635bec5e10c833697c55aab442776 (diff) | |
Merge branch 'dl/octopus-graph-bug'
"git log --graph" for an octopus merge is sometimes colored
incorrectly, which is demonstrated and documented but not yet
fixed.
* dl/octopus-graph-bug:
t4214: demonstrate octopus graph coloring failure
t4214: explicitly list tags in log
t4214: generate expect in their own test cases
t4214: use test_merge
test-lib: let test_merge() perform octopus merges
Diffstat (limited to 't/test-lib-functions.sh')
| -rw-r--r-- | t/test-lib-functions.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 87bf3a2287..b299ecc326 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -228,9 +228,11 @@ test_commit () { # can be a tag pointing to the commit-to-merge. test_merge () { + label="$1" && + shift && test_tick && - git merge -m "$1" "$2" && - git tag "$1" + git merge -m "$label" "$@" && + git tag "$label" } # Efficiently create <nr> commits, each with a unique number (from 1 to <nr> |