undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-lib: let test_merge() perform octopus merges

Browse Source 
Currently test_merge() only allows developers to merge in one branch.
However, this restriction is artificial and there is no reason why it
needs to be this way.

Extend test_merge() to allow the specification of multiple branches so
that octopus merges can be performed.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu 2019-10-03 17:23:13 -07:00 committed by Junio C Hamano
parent 5fa0f5238b
commit 94ba151300
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/test-lib-functions.sh
View File

@ -228,9 +228,11 @@ test_commit () {
# can be a tag pointing to the commit-to-merge. # can be a tag pointing to the commit-to-merge.
test_merge () { test_merge () {
label="$1" &&
shift &&
test_tick && test_tick &&
git merge -m "$1" "$2" && git merge -m "$label" "$@" &&
git tag "$1" git tag "$label"
} }
# Efficiently create <nr> commits, each with a unique number (from 1 to <nr> # Efficiently create <nr> commits, each with a unique number (from 1 to <nr>