mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
283b365e45
The test fails for me on NetBSD 6.0.1 and reports:
ok 1 - ref name '' is invalid
ok 2 - ref name '/' is invalid
ok 3 - ref name '/' is invalid with options --allow-onelevel
ok 4 - ref name '/' is invalid with options --normalize
error: bug in the test script: not 2 or 3 parameters to test-expect-success
The alleged bug is in this line:
invalid_ref NOT_MINGW '/' '--allow-onelevel --normalize'
invalid_ref() constructs a test case description using its last argument,
but the shell seems to split it up into two pieces if it contains a
space. Minimal test case:
# on NetBSD with /bin/sh
$ a() { echo $#-$1-$2; }
$ t="x"; a "${t:+$t}"
1-x-
$ t="x y"; a "${t:+$t}"
2-x-y
$ t="x y"; a "${t:+x y}"
1-x y-
# and with bash
$ t="x y"; a "${t:+$t}"
1-x y-
$ t="x y"; a "${t:+x y}"
1-x y-
This may be a bug in the shell, but here's a simple workaround: Construct
the description string first and store it in a variable, and then use
that to call test_expect_success().
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
199 lines
5.3 KiB
Bash
Executable file
199 lines
5.3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test git check-ref-format'
|
|
|
|
. ./test-lib.sh
|
|
|
|
valid_ref() {
|
|
prereq=
|
|
case $1 in
|
|
[A-Z]*)
|
|
prereq=$1
|
|
shift
|
|
esac
|
|
desc="ref name '$1' is valid${2:+ with options $2}"
|
|
test_expect_success $prereq "$desc" "
|
|
git check-ref-format $2 '$1'
|
|
"
|
|
}
|
|
invalid_ref() {
|
|
prereq=
|
|
case $1 in
|
|
[A-Z]*)
|
|
prereq=$1
|
|
shift
|
|
esac
|
|
desc="ref name '$1' is invalid${2:+ with options $2}"
|
|
test_expect_success $prereq "$desc" "
|
|
test_must_fail git check-ref-format $2 '$1'
|
|
"
|
|
}
|
|
|
|
invalid_ref ''
|
|
invalid_ref NOT_MINGW '/'
|
|
invalid_ref NOT_MINGW '/' --allow-onelevel
|
|
invalid_ref NOT_MINGW '/' --normalize
|
|
invalid_ref NOT_MINGW '/' '--allow-onelevel --normalize'
|
|
valid_ref 'foo/bar/baz'
|
|
valid_ref 'foo/bar/baz' --normalize
|
|
invalid_ref 'refs///heads/foo'
|
|
valid_ref 'refs///heads/foo' --normalize
|
|
invalid_ref 'heads/foo/'
|
|
invalid_ref NOT_MINGW '/heads/foo'
|
|
valid_ref NOT_MINGW '/heads/foo' --normalize
|
|
invalid_ref '///heads/foo'
|
|
valid_ref '///heads/foo' --normalize
|
|
invalid_ref './foo'
|
|
invalid_ref './foo/bar'
|
|
invalid_ref 'foo/./bar'
|
|
invalid_ref 'foo/bar/.'
|
|
invalid_ref '.refs/foo'
|
|
invalid_ref 'heads/foo..bar'
|
|
invalid_ref 'heads/foo?bar'
|
|
valid_ref 'foo./bar'
|
|
invalid_ref 'heads/foo.lock'
|
|
invalid_ref 'heads///foo.lock'
|
|
invalid_ref 'foo.lock/bar'
|
|
invalid_ref 'foo.lock///bar'
|
|
valid_ref 'heads/foo@bar'
|
|
invalid_ref 'heads/v@{ation'
|
|
invalid_ref 'heads/foo\bar'
|
|
invalid_ref "$(printf 'heads/foo\t')"
|
|
invalid_ref "$(printf 'heads/foo\177')"
|
|
valid_ref "$(printf 'heads/fu\303\237')"
|
|
invalid_ref 'heads/*foo/bar' --refspec-pattern
|
|
invalid_ref 'heads/foo*/bar' --refspec-pattern
|
|
invalid_ref 'heads/f*o/bar' --refspec-pattern
|
|
|
|
ref='foo'
|
|
invalid_ref "$ref"
|
|
valid_ref "$ref" --allow-onelevel
|
|
invalid_ref "$ref" --refspec-pattern
|
|
valid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
invalid_ref "$ref" --normalize
|
|
valid_ref "$ref" '--allow-onelevel --normalize'
|
|
|
|
ref='foo/bar'
|
|
valid_ref "$ref"
|
|
valid_ref "$ref" --allow-onelevel
|
|
valid_ref "$ref" --refspec-pattern
|
|
valid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
valid_ref "$ref" --normalize
|
|
|
|
ref='foo/*'
|
|
invalid_ref "$ref"
|
|
invalid_ref "$ref" --allow-onelevel
|
|
valid_ref "$ref" --refspec-pattern
|
|
valid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
|
|
ref='*/foo'
|
|
invalid_ref "$ref"
|
|
invalid_ref "$ref" --allow-onelevel
|
|
valid_ref "$ref" --refspec-pattern
|
|
valid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
invalid_ref "$ref" --normalize
|
|
valid_ref "$ref" '--refspec-pattern --normalize'
|
|
|
|
ref='foo/*/bar'
|
|
invalid_ref "$ref"
|
|
invalid_ref "$ref" --allow-onelevel
|
|
valid_ref "$ref" --refspec-pattern
|
|
valid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
|
|
ref='*'
|
|
invalid_ref "$ref"
|
|
invalid_ref "$ref" --allow-onelevel
|
|
invalid_ref "$ref" --refspec-pattern
|
|
valid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
|
|
ref='foo/*/*'
|
|
invalid_ref "$ref" --refspec-pattern
|
|
invalid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
|
|
ref='*/foo/*'
|
|
invalid_ref "$ref" --refspec-pattern
|
|
invalid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
|
|
ref='*/*/foo'
|
|
invalid_ref "$ref" --refspec-pattern
|
|
invalid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
|
|
|
ref='/foo'
|
|
invalid_ref NOT_MINGW "$ref"
|
|
invalid_ref NOT_MINGW "$ref" --allow-onelevel
|
|
invalid_ref NOT_MINGW "$ref" --refspec-pattern
|
|
invalid_ref NOT_MINGW "$ref" '--refspec-pattern --allow-onelevel'
|
|
invalid_ref NOT_MINGW "$ref" --normalize
|
|
valid_ref NOT_MINGW "$ref" '--allow-onelevel --normalize'
|
|
invalid_ref NOT_MINGW "$ref" '--refspec-pattern --normalize'
|
|
valid_ref NOT_MINGW "$ref" '--refspec-pattern --allow-onelevel --normalize'
|
|
|
|
test_expect_success "check-ref-format --branch @{-1}" '
|
|
T=$(git write-tree) &&
|
|
sha1=$(echo A | git commit-tree $T) &&
|
|
git update-ref refs/heads/master $sha1 &&
|
|
git update-ref refs/remotes/origin/master $sha1 &&
|
|
git checkout master &&
|
|
git checkout origin/master &&
|
|
git checkout master &&
|
|
refname=$(git check-ref-format --branch @{-1}) &&
|
|
test "$refname" = "$sha1" &&
|
|
refname2=$(git check-ref-format --branch @{-2}) &&
|
|
test "$refname2" = master'
|
|
|
|
test_expect_success 'check-ref-format --branch from subdir' '
|
|
mkdir subdir &&
|
|
|
|
T=$(git write-tree) &&
|
|
sha1=$(echo A | git commit-tree $T) &&
|
|
git update-ref refs/heads/master $sha1 &&
|
|
git update-ref refs/remotes/origin/master $sha1 &&
|
|
git checkout master &&
|
|
git checkout origin/master &&
|
|
git checkout master &&
|
|
refname=$(
|
|
cd subdir &&
|
|
git check-ref-format --branch @{-1}
|
|
) &&
|
|
test "$refname" = "$sha1"
|
|
'
|
|
|
|
valid_ref_normalized() {
|
|
prereq=
|
|
case $1 in
|
|
[A-Z]*)
|
|
prereq=$1
|
|
shift
|
|
esac
|
|
test_expect_success $prereq "ref name '$1' simplifies to '$2'" "
|
|
refname=\$(git check-ref-format --normalize '$1') &&
|
|
test \"\$refname\" = '$2'
|
|
"
|
|
}
|
|
invalid_ref_normalized() {
|
|
prereq=
|
|
case $1 in
|
|
[A-Z]*)
|
|
prereq=$1
|
|
shift
|
|
esac
|
|
test_expect_success $prereq "check-ref-format --normalize rejects '$1'" "
|
|
test_must_fail git check-ref-format --normalize '$1'
|
|
"
|
|
}
|
|
|
|
valid_ref_normalized 'heads/foo' 'heads/foo'
|
|
valid_ref_normalized 'refs///heads/foo' 'refs/heads/foo'
|
|
valid_ref_normalized NOT_MINGW '/heads/foo' 'heads/foo'
|
|
valid_ref_normalized '///heads/foo' 'heads/foo'
|
|
invalid_ref_normalized 'foo'
|
|
invalid_ref_normalized NOT_MINGW '/foo'
|
|
invalid_ref_normalized 'heads/foo/../bar'
|
|
invalid_ref_normalized 'heads/./foo'
|
|
invalid_ref_normalized 'heads\foo'
|
|
invalid_ref_normalized 'heads/foo.lock'
|
|
invalid_ref_normalized 'heads///foo.lock'
|
|
invalid_ref_normalized 'foo.lock/bar'
|
|
invalid_ref_normalized 'foo.lock///bar'
|
|
|
|
test_done
|