summaryrefslogtreecommitdiff
path: root/Documentation/git-branch.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-03-24 03:21:24 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-24 11:40:50 -0700
commit482ce70e14fdd5d03304a92f1740e6a9022e7958 (patch)
treee49805608794d2f4e8276b0bb2151b528cf2d892 /Documentation/git-branch.txt
parentrev-list --min-parents,--max-parents: doc, test and completion (diff)
downloadtgif-482ce70e14fdd5d03304a92f1740e6a9022e7958.tar.xz
tests: avoid nonportable {foo,bar} glob
Unlike bash and ksh, dash and busybox ash do not support brace expansion (as in 'echo {hello,world}'). So when dash is sh, t6009.13 (set up dodecapus) ends up pass a string beginning with "root{1,2," to "git merge" verbatim and the test fails. Fix it by introducing a variable to hold the list of parents for the dodecapus and populating it in a more low-tech way. While at it, simplify a little by combining this setup code with the test it sets up for. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-branch.txt')
0 files changed, 0 insertions, 0 deletions