t0000-t0999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Jul 1, 2018 at 20:23 UTC
75651fd7835f6c74d7ef952ac314e69e97fe4a92
3 files changed
+15
-15
t/t0000-basic.sh
+1
-1
@@ -1081,7 +1081,7 @@ test_expect_success 'very long name in the index handled sanely' '
1081
(
1082
git ls-files -s path4 |
1083
sed -e "s/ .*/ /" |
1084
- tr -d "\012"
1084
+ tr -d "\012" &&
1085
echo "$a"
1086
) | git update-index --index-info &&
1087
len=$(git ls-files "a*" | wc -c) &&
t/t0003-attributes.sh
+12
-12
@@ -34,15 +34,15 @@ test_expect_success 'open-quoted pathname' '
34
test_expect_success 'setup' '
35
mkdir -p a/b/d a/c b &&
36
(
37
- echo "[attr]notest !test"
38
- echo "\" d \" test=d"
39
- echo " e test=e"
40
- echo " e\" test=e"
41
- echo "f test=f"
42
- echo "a/i test=a/i"
43
- echo "onoff test -test"
44
- echo "offon -test test"
45
- echo "no notest"
37
+ echo "[attr]notest !test" &&
38
+ echo "\" d \" test=d" &&
39
+ echo " e test=e" &&
40
+ echo " e\" test=e" &&
41
+ echo "f test=f" &&
42
+ echo "a/i test=a/i" &&
43
+ echo "onoff test -test" &&
44
+ echo "offon -test test" &&
45
+ echo "no notest" &&
46
echo "A/e/F test=A/e/F"
47
) >.gitattributes &&
48
(
@@ -51,7 +51,7 @@ test_expect_success 'setup' '
51
) >a/.gitattributes &&
52
(
53
echo "h test=a/b/h" &&
54
- echo "d/* test=a/b/d/*"
54
+ echo "d/* test=a/b/d/*" &&
55
echo "d/yes notest"
56
) >a/b/.gitattributes &&
57
(
@@ -287,7 +287,7 @@ test_expect_success 'bare repository: check that .gitattribute is ignored' '
287
(
288
cd bare.git &&
289
(
290
- echo "f test=f"
290
+ echo "f test=f" &&
291
echo "a/i test=a/i"
292
) >.gitattributes &&
293
attr_check f unspecified &&
@@ -312,7 +312,7 @@ test_expect_success 'bare repository: test info/attributes' '
312
(
313
cd bare.git &&
314
(
315
- echo "f test=f"
315
+ echo "f test=f" &&
316
echo "a/i test=a/i"
317
) >info/attributes &&
318
attr_check f f &&
t/t0021-conversion.sh
+2
-2
@@ -785,7 +785,7 @@ test_expect_success PERL 'missing file in delayed checkout' '
785
cd repo &&
786
git init &&
787
echo "*.a filter=bug" >.gitattributes &&
788
- cp "$TEST_ROOT/test.o" missing-delay.a
788
+ cp "$TEST_ROOT/test.o" missing-delay.a &&
789
git add . &&
790
git commit -m "test commit"
791
) &&
@@ -807,7 +807,7 @@ test_expect_success PERL 'invalid file in delayed checkout' '
807
git init &&
808
echo "*.a filter=bug" >.gitattributes &&
809
cp "$TEST_ROOT/test.o" invalid-delay.a &&
810
- cp "$TEST_ROOT/test.o" unfiltered
810
+ cp "$TEST_ROOT/test.o" unfiltered &&
811
git add . &&
812
git commit -m "test commit"
813
) &&