From 8d9c50105f908b2adde4b7c77537cf95f19cd893 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Thu, 15 Sep 2011 23:10:25 +0200 Subject: Change check_ref_format() to take a flags argument Change check_ref_format() to take a flags argument that indicates what is acceptable in the reference name (analogous to "git check-ref-format"'s "--allow-onelevel" and "--refspec-pattern"). This is more convenient for callers and also fixes a failure in the test suite (and likely elsewhere in the code) by enabling "onelevel" and "refspec-pattern" to be allowed independently of each other. Also rename check_ref_format() to check_refname_format() to make it obvious that it deals with refnames rather than references themselves. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- t/t1402-check-ref-format.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 't/t1402-check-ref-format.sh') diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh index f551eef37f..1cad88f2dc 100755 --- a/t/t1402-check-ref-format.sh +++ b/t/t1402-check-ref-format.sh @@ -87,11 +87,7 @@ valid_ref "$ref" '--refspec-pattern --allow-onelevel' ref='*' invalid_ref "$ref" - -#invalid_ref "$ref" --allow-onelevel -test_expect_failure "ref name '$ref' is invalid with options --allow-onelevel" \ - "test_must_fail git check-ref-format --allow-onelevel '$ref'" - +invalid_ref "$ref" --allow-onelevel invalid_ref "$ref" --refspec-pattern valid_ref "$ref" '--refspec-pattern --allow-onelevel' -- cgit v1.2.1