testlib: improve test_merge utility function
commit0a11cfcbde809738754fb8738650de92c3c5b831
authorKyle J. McKay <mackyle@gmail.com>
Mon, 19 Jun 2017 21:33:40 +0000 (19 14:33 -0700)
committerKyle J. McKay <mackyle@gmail.com>
Mon, 19 Jun 2017 21:33:40 +0000 (19 14:33 -0700)
tree6a96f241c99964d58031523a668d2afe754f8a64
parent6404071ca188980319721b4bf8388f089491074a
testlib: improve test_merge utility function

Make it automatically skip the tag (just like test_commit) if
the message is not "tagish".

Make it automatically supply --allow-unrelated-histories when
running Git >= 2.9.

Make it capable of accepting additional options.

Preset the test_auh variable to "--allow-unrelated-histories" when
running Git >= 2.9 as part of this change and document that.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
t/README-TESTLIB
t/test-lib-functions.sh
t/test-lib-main.sh
t/test-lib.sh