From 2e51681cb9dec70d263702d48091293868fbb172 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 10 Oct 2011 16:12:00 -0500 Subject: [PATCH] t1402: Ignore a few cases that must fail due to DOS path expansion Signed-off-by: Johannes Schindelin --- t/t1402-check-ref-format.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh index 710fccad36..1a5e34320a 100755 --- a/t/t1402-check-ref-format.sh +++ b/t/t1402-check-ref-format.sh @@ -36,7 +36,7 @@ invalid_ref 'refs///heads/foo' valid_ref 'refs///heads/foo' --normalize invalid_ref 'heads/foo/' invalid_ref '/heads/foo' -valid_ref '/heads/foo' --normalize +test_have_prereq MINGW || valid_ref '/heads/foo' --normalize invalid_ref '///heads/foo' valid_ref '///heads/foo' --normalize invalid_ref './foo' @@ -120,9 +120,12 @@ invalid_ref "$ref" --allow-onelevel invalid_ref "$ref" --refspec-pattern invalid_ref "$ref" '--refspec-pattern --allow-onelevel' invalid_ref "$ref" --normalize -valid_ref "$ref" '--allow-onelevel --normalize' -invalid_ref "$ref" '--refspec-pattern --normalize' -valid_ref "$ref" '--refspec-pattern --allow-onelevel --normalize' +if test_have_prereq NOT_MINGW +then + valid_ref "$ref" '--allow-onelevel --normalize' + invalid_ref "$ref" '--refspec-pattern --normalize' + valid_ref "$ref" '--refspec-pattern --allow-onelevel --normalize' +fi test_expect_success "check-ref-format --branch @{-1}" ' T=$(git write-tree) && @@ -166,10 +169,10 @@ invalid_ref_normalized() { valid_ref_normalized 'heads/foo' 'heads/foo' valid_ref_normalized 'refs///heads/foo' 'refs/heads/foo' -valid_ref_normalized '/heads/foo' 'heads/foo' +test_have_prereq MINGW || valid_ref_normalized '/heads/foo' 'heads/foo' valid_ref_normalized '///heads/foo' 'heads/foo' invalid_ref_normalized 'foo' -invalid_ref_normalized '/foo' +test_have_prereq MINGW || invalid_ref_normalized '/foo' invalid_ref_normalized 'heads/foo/../bar' invalid_ref_normalized 'heads/./foo' invalid_ref_normalized 'heads\foo'