t7061: comments and one failure

From

Torsten Bögershausen <tboegi@web.de>

Date

Jan 5, 2013, 11:07 UTC

Message-ID

<50E8096C.7000501@web.de>

Hej,
TC 9 is failing (Mac OS X 10.6),
==========================
expecting success: 
        >tracked/uncommitted &&
        git status --porcelain --ignored >actual &&
        test_cmp expected actual

@@ -1,4 +1,3 @@
 ?? .gitignore
 ?? actual
 ?? expected
-!! tracked/
not ok 9 - status ignored tracked directory and uncommitted file with --ignore
#       
#               >tracked/uncommitted &&
#               git status --porcelain --ignored >actual &&
#               test_cmp expected actual
#       
=======================
I haven't been able to dig further into this,
(I can volonteer to do some more debugging).
Looking into the code, there are 2 questions:

1) echo "ignored" >.gitignore &&
  We don't need the quoting of a simple string which does not have space in it.
2)  : >untracked/ignored &&
Do we need the colon here?

Would it make sence to do the following:


diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh
index 0da1214..761a2e7 100755
--- a/t/t7061-wtstatus-ignore.sh
+++ b/t/t7061-wtstatus-ignore.sh
@@ -12,10 +12,10 @@ cat >expected <<\EOF
 EOF
 
 test_expect_success 'status untracked directory with --ignored' '
-	echo "ignored" >.gitignore &&
+	echo ignored >.gitignore &&
 	mkdir untracked &&
-	: >untracked/ignored &&
-	: >untracked/uncommitted &&
+	>untracked/ignored &&
+	>untracked/uncommitted &&
 	git status --porcelain --ignored >actual &&
 	test_cmp expected actual
 '
@@ -43,7 +43,7 @@ EOF
 test_expect_success 'status ignored directory with --ignore' '
 	rm -rf untracked &&
 	mkdir ignored &&
-	: >ignored/uncommitted &&
+	>ignored/uncommitted &&
 	git status --porcelain --ignored >actual &&
 	test_cmp expected actual
 '
@@ -71,8 +71,8 @@ test_expect_success 'status untracked directory with ignored files with --ignore
 	rm -rf ignored &&
 	mkdir untracked-ignored &&
 	mkdir untracked-ignored/test &&
-	: >untracked-ignored/ignored &&
-	: >untracked-ignored/test/ignored &&
+	>untracked-ignored/ignored &&
+	>untracked-ignored/test/ignored &&
 	git status --porcelain --ignored >actual &&
 	test_cmp expected actual
 '
@@ -99,10 +99,10 @@ EOF
 test_expect_success 'status ignored tracked directory with --ignore' '
 	rm -rf untracked-ignored &&
 	mkdir tracked &&
-	: >tracked/committed &&
+	>tracked/committed &&
 	git add tracked/committed &&
 	git commit -m. &&
-	echo "tracked" >.gitignore &&
+	echo tracked >.gitignore &&
 	git status --porcelain --ignored >actual &&
 	test_cmp expected actual
 '
@@ -126,7 +126,7 @@ cat >expected <<\EOF
 EOF
 
 test_expect_success 'status ignored tracked directory and uncommitted file with --ignore' '
-	: >tracked/uncommitted &&
+	>tracked/uncommitted &&
 	git status --porcelain --ignored >actual &&
 	test_cmp expected actual
 '


/Torsten