2009-10-12 09:27:04 +04:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='Test git check-ref-format'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
valid_ref() {
|
2011-10-13 12:06:20 +04:00
|
|
|
prereq=
|
|
|
|
case $1 in
|
|
|
|
[A-Z]*)
|
|
|
|
prereq=$1
|
|
|
|
shift
|
|
|
|
esac
|
|
|
|
test_expect_success $prereq "ref name '$1' is valid${2:+ with options $2}" "
|
|
|
|
git check-ref-format $2 '$1'
|
|
|
|
"
|
2009-10-12 09:27:04 +04:00
|
|
|
}
|
|
|
|
invalid_ref() {
|
2011-10-13 12:06:20 +04:00
|
|
|
prereq=
|
|
|
|
case $1 in
|
|
|
|
[A-Z]*)
|
|
|
|
prereq=$1
|
|
|
|
shift
|
|
|
|
esac
|
|
|
|
test_expect_success $prereq "ref name '$1' is invalid${2:+ with options $2}" "
|
|
|
|
test_must_fail git check-ref-format $2 '$1'
|
|
|
|
"
|
2009-10-12 09:27:04 +04:00
|
|
|
}
|
|
|
|
|
2011-09-16 01:10:22 +04:00
|
|
|
invalid_ref ''
|
2011-10-13 12:06:20 +04:00
|
|
|
invalid_ref NOT_MINGW '/'
|
|
|
|
invalid_ref NOT_MINGW '/' --allow-onelevel
|
|
|
|
invalid_ref NOT_MINGW '/' --normalize
|
|
|
|
invalid_ref NOT_MINGW '/' '--allow-onelevel --normalize'
|
2009-10-12 09:27:04 +04:00
|
|
|
valid_ref 'foo/bar/baz'
|
2011-09-16 01:10:30 +04:00
|
|
|
valid_ref 'foo/bar/baz' --normalize
|
|
|
|
invalid_ref 'refs///heads/foo'
|
|
|
|
valid_ref 'refs///heads/foo' --normalize
|
2009-10-12 09:27:04 +04:00
|
|
|
invalid_ref 'heads/foo/'
|
2011-10-13 12:06:20 +04:00
|
|
|
invalid_ref NOT_MINGW '/heads/foo'
|
|
|
|
valid_ref NOT_MINGW '/heads/foo' --normalize
|
2011-09-16 01:10:30 +04:00
|
|
|
invalid_ref '///heads/foo'
|
|
|
|
valid_ref '///heads/foo' --normalize
|
2009-10-12 09:27:04 +04:00
|
|
|
invalid_ref './foo'
|
2011-09-16 01:10:23 +04:00
|
|
|
invalid_ref './foo/bar'
|
|
|
|
invalid_ref 'foo/./bar'
|
|
|
|
invalid_ref 'foo/bar/.'
|
2009-10-12 09:27:04 +04:00
|
|
|
invalid_ref '.refs/foo'
|
|
|
|
invalid_ref 'heads/foo..bar'
|
|
|
|
invalid_ref 'heads/foo?bar'
|
|
|
|
valid_ref 'foo./bar'
|
|
|
|
invalid_ref 'heads/foo.lock'
|
2011-09-16 01:10:22 +04:00
|
|
|
invalid_ref 'heads///foo.lock'
|
2011-09-16 01:10:27 +04:00
|
|
|
invalid_ref 'foo.lock/bar'
|
|
|
|
invalid_ref 'foo.lock///bar'
|
2009-10-12 09:27:04 +04:00
|
|
|
valid_ref 'heads/foo@bar'
|
|
|
|
invalid_ref 'heads/v@{ation'
|
|
|
|
invalid_ref 'heads/foo\bar'
|
2011-08-27 08:12:44 +04:00
|
|
|
invalid_ref "$(printf 'heads/foo\t')"
|
|
|
|
invalid_ref "$(printf 'heads/foo\177')"
|
|
|
|
valid_ref "$(printf 'heads/fu\303\237')"
|
2011-09-16 01:10:23 +04:00
|
|
|
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'
|
2011-09-16 01:10:30 +04:00
|
|
|
invalid_ref "$ref" --normalize
|
|
|
|
valid_ref "$ref" '--allow-onelevel --normalize'
|
2011-09-16 01:10:23 +04:00
|
|
|
|
|
|
|
ref='foo/bar'
|
|
|
|
valid_ref "$ref"
|
|
|
|
valid_ref "$ref" --allow-onelevel
|
|
|
|
valid_ref "$ref" --refspec-pattern
|
|
|
|
valid_ref "$ref" '--refspec-pattern --allow-onelevel'
|
2011-09-16 01:10:30 +04:00
|
|
|
valid_ref "$ref" --normalize
|
2011-09-16 01:10:23 +04:00
|
|
|
|
|
|
|
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'
|
2011-09-16 01:10:30 +04:00
|
|
|
invalid_ref "$ref" --normalize
|
|
|
|
valid_ref "$ref" '--refspec-pattern --normalize'
|
2011-09-16 01:10:23 +04:00
|
|
|
|
|
|
|
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"
|
2011-09-16 01:10:25 +04:00
|
|
|
invalid_ref "$ref" --allow-onelevel
|
2011-09-16 01:10:23 +04:00
|
|
|
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'
|
2011-10-13 12:06:20 +04:00
|
|
|
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'
|
2009-10-12 09:27:04 +04:00
|
|
|
|
|
|
|
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 &&
|
2010-10-31 04:46:54 +03:00
|
|
|
git update-ref refs/remotes/origin/master $sha1 &&
|
2009-10-12 09:27:04 +04:00
|
|
|
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'
|
|
|
|
|
2010-08-06 07:39:22 +04:00
|
|
|
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 &&
|
2010-10-31 04:46:54 +03:00
|
|
|
git update-ref refs/remotes/origin/master $sha1 &&
|
2010-08-06 07:39:22 +04:00
|
|
|
git checkout master &&
|
|
|
|
git checkout origin/master &&
|
|
|
|
git checkout master &&
|
|
|
|
refname=$(
|
|
|
|
cd subdir &&
|
|
|
|
git check-ref-format --branch @{-1}
|
|
|
|
) &&
|
|
|
|
test "$refname" = "$sha1"
|
|
|
|
'
|
|
|
|
|
2009-10-13 03:39:43 +04:00
|
|
|
valid_ref_normalized() {
|
2011-10-13 12:06:20 +04:00
|
|
|
prereq=
|
|
|
|
case $1 in
|
|
|
|
[A-Z]*)
|
|
|
|
prereq=$1
|
|
|
|
shift
|
|
|
|
esac
|
|
|
|
test_expect_success $prereq "ref name '$1' simplifies to '$2'" "
|
2011-09-16 01:10:30 +04:00
|
|
|
refname=\$(git check-ref-format --normalize '$1') &&
|
2011-10-13 12:06:20 +04:00
|
|
|
test \"\$refname\" = '$2'
|
|
|
|
"
|
2009-10-13 03:39:43 +04:00
|
|
|
}
|
|
|
|
invalid_ref_normalized() {
|
2011-10-13 12:06:20 +04:00
|
|
|
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'
|
|
|
|
"
|
2009-10-13 03:39:43 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
valid_ref_normalized 'heads/foo' 'heads/foo'
|
|
|
|
valid_ref_normalized 'refs///heads/foo' 'refs/heads/foo'
|
2011-10-13 12:06:20 +04:00
|
|
|
valid_ref_normalized NOT_MINGW '/heads/foo' 'heads/foo'
|
check-ref-format --print: Normalize refnames that start with slashes
When asked if "refs///heads/master" is valid, check-ref-format says "Yes,
it is well formed", and when asked to print canonical form, it shows
"refs/heads/master". This is so that it can be tucked after "$GIT_DIR/"
to form a valid pathname for a loose ref, and we normalize a pathname like
"$GIT_DIR/refs///heads/master" to de-dup the slashes in it.
Similarly, when asked if "/refs/heads/master" is valid, check-ref-format
says "Yes, it is Ok", but the leading slash is not removed when printing,
leading to "$GIT_DIR//refs/heads/master".
Fix it to make sure such leading slashes are removed. Add tests that such
refnames are accepted and normalized correctly.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-08-25 23:19:24 +04:00
|
|
|
valid_ref_normalized '///heads/foo' 'heads/foo'
|
2009-10-13 03:39:43 +04:00
|
|
|
invalid_ref_normalized 'foo'
|
2011-10-13 12:06:20 +04:00
|
|
|
invalid_ref_normalized NOT_MINGW '/foo'
|
2009-10-13 03:39:43 +04:00
|
|
|
invalid_ref_normalized 'heads/foo/../bar'
|
|
|
|
invalid_ref_normalized 'heads/./foo'
|
|
|
|
invalid_ref_normalized 'heads\foo'
|
2011-09-16 01:10:22 +04:00
|
|
|
invalid_ref_normalized 'heads/foo.lock'
|
|
|
|
invalid_ref_normalized 'heads///foo.lock'
|
2011-09-16 01:10:27 +04:00
|
|
|
invalid_ref_normalized 'foo.lock/bar'
|
|
|
|
invalid_ref_normalized 'foo.lock///bar'
|
2009-10-13 03:39:43 +04:00
|
|
|
|
2009-10-12 09:27:04 +04:00
|
|
|
test_done
|