Merge branch 'tg/t0021-racefix'

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 3563e77b374c69a138bdfa3b274b75b6094c55a7..ff641b348a1bacc54fc7c582f4ae0881446a6827 100755 (executable)
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -36,15 +36,15 @@ test_expect_success 'setup 1' '
        test_tick &&
        git commit -m "master modifies a and d/e" &&
        c1=$(git rev-parse --verify HEAD) &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o1   a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o1   d/e"
-               echo "100644 $o1 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o1   a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o1   d/e" &&
+               echo "100644 $o1 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o1 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -54,15 +54,15 @@ test_expect_success 'setup 2' '
 
        rm -rf [abcd] &&
        git checkout side &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o0   a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o0 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o0   a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o0 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual &&
@@ -75,15 +75,15 @@ test_expect_success 'setup 2' '
        test_tick &&
        git commit -m "side modifies a" &&
        c2=$(git rev-parse --verify HEAD) &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o2   a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o2 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o2   a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o2 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -93,15 +93,15 @@ test_expect_success 'setup 3' '
 
        rm -rf [abcd] &&
        git checkout df-1 &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o0   a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o0 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o0   a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o0 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual &&
@@ -112,15 +112,15 @@ test_expect_success 'setup 3' '
        test_tick &&
        git commit -m "df-1 makes b/c" &&
        c3=$(git rev-parse --verify HEAD) &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o0   a"
-               echo "100644 blob $o3   b/c"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o0 0      a"
-               echo "100644 $o3 0      b/c"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o0   a" &&
+               echo "100644 blob $o3   b/c" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o0 0      a" &&
+               echo "100644 $o3 0      b/c" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -130,15 +130,15 @@ test_expect_success 'setup 4' '
 
        rm -rf [abcd] &&
        git checkout df-2 &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o0   a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o0 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o0   a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o0 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual &&
@@ -149,15 +149,15 @@ test_expect_success 'setup 4' '
        test_tick &&
        git commit -m "df-2 makes a/c" &&
        c4=$(git rev-parse --verify HEAD) &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o4   a/c"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o4 0      a/c"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o4   a/c" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o4 0      a/c" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -167,15 +167,15 @@ test_expect_success 'setup 5' '
 
        rm -rf [abcd] &&
        git checkout remove &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o0   a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o0 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o0   a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o0 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual &&
@@ -190,13 +190,13 @@ test_expect_success 'setup 5' '
        test_tick &&
        git commit -m "remove removes b and modifies a" &&
        c5=$(git rev-parse --verify HEAD) &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o5   a"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o5 0      a"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o5   a" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o5 0      a" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -207,15 +207,15 @@ test_expect_success 'setup 6' '
 
        rm -rf [abcd] &&
        git checkout df-3 &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o0   a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 $o0 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o0   a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 $o0 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o0 0      d/e"
        ) >expected &&
        test_cmp expected actual &&
@@ -226,15 +226,15 @@ test_expect_success 'setup 6' '
        test_tick &&
        git commit -m "df-3 makes d" &&
        c6=$(git rev-parse --verify HEAD) &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o0   a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o6   d"
-               echo "100644 $o0 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 blob $o0   a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o6   d" &&
+               echo "100644 $o0 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o6 0      d"
        ) >expected &&
        test_cmp expected actual
@@ -286,11 +286,11 @@ test_expect_success 'merge-recursive result' '
 
        git ls-files -s >actual &&
        (
-               echo "100644 $o0 1      a"
-               echo "100644 $o2 2      a"
-               echo "100644 $o1 3      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 $o0 1      a" &&
+               echo "100644 $o2 2      a" &&
+               echo "100644 $o1 3      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o1 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -325,10 +325,10 @@ test_expect_success 'merge-recursive remove conflict' '
 
        git ls-files -s >actual &&
        (
-               echo "100644 $o0 1      a"
-               echo "100644 $o1 2      a"
-               echo "100644 $o5 3      a"
-               echo "100644 $o0 0      c"
+               echo "100644 $o0 1      a" &&
+               echo "100644 $o1 2      a" &&
+               echo "100644 $o5 3      a" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o1 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -347,9 +347,9 @@ test_expect_success 'merge-recursive result' '
 
        git ls-files -s >actual &&
        (
-               echo "100644 $o1 0      a"
-               echo "100644 $o3 0      b/c"
-               echo "100644 $o0 0      c"
+               echo "100644 $o1 0      a" &&
+               echo "100644 $o3 0      b/c" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o1 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -369,11 +369,11 @@ test_expect_success 'merge-recursive d/f conflict result' '
 
        git ls-files -s >actual &&
        (
-               echo "100644 $o0 1      a"
-               echo "100644 $o1 2      a"
-               echo "100644 $o4 0      a/c"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 $o0 1      a" &&
+               echo "100644 $o1 2      a" &&
+               echo "100644 $o4 0      a/c" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o1 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -393,11 +393,11 @@ test_expect_success 'merge-recursive d/f conflict result the other way' '
 
        git ls-files -s >actual &&
        (
-               echo "100644 $o0 1      a"
-               echo "100644 $o1 3      a"
-               echo "100644 $o4 0      a/c"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 $o0 1      a" &&
+               echo "100644 $o1 3      a" &&
+               echo "100644 $o4 0      a/c" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o1 0      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -417,11 +417,11 @@ test_expect_success 'merge-recursive d/f conflict result' '
 
        git ls-files -s >actual &&
        (
-               echo "100644 $o1 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
-               echo "100644 $o6 3      d"
-               echo "100644 $o0 1      d/e"
+               echo "100644 $o1 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
+               echo "100644 $o6 3      d" &&
+               echo "100644 $o0 1      d/e" &&
                echo "100644 $o1 2      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -441,11 +441,11 @@ test_expect_success 'merge-recursive d/f conflict result' '
 
        git ls-files -s >actual &&
        (
-               echo "100644 $o1 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
-               echo "100644 $o6 2      d"
-               echo "100644 $o0 1      d/e"
+               echo "100644 $o1 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
+               echo "100644 $o6 2      d" &&
+               echo "100644 $o0 1      d/e" &&
                echo "100644 $o1 3      d/e"
        ) >expected &&
        test_cmp expected actual
@@ -465,13 +465,13 @@ test_expect_success 'reset and bind merge' '
        git read-tree --prefix=M/ master &&
        git ls-files -s >actual &&
        (
-               echo "100644 $o1 0      M/a"
-               echo "100644 $o0 0      M/b"
-               echo "100644 $o0 0      M/c"
-               echo "100644 $o1 0      M/d/e"
-               echo "100644 $o1 0      a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 $o1 0      M/a" &&
+               echo "100644 $o0 0      M/b" &&
+               echo "100644 $o0 0      M/c" &&
+               echo "100644 $o1 0      M/d/e" &&
+               echo "100644 $o1 0      a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o1 0      d/e"
        ) >expected &&
        test_cmp expected actual &&
@@ -479,17 +479,17 @@ test_expect_success 'reset and bind merge' '
        git read-tree --prefix=a1/ master &&
        git ls-files -s >actual &&
        (
-               echo "100644 $o1 0      M/a"
-               echo "100644 $o0 0      M/b"
-               echo "100644 $o0 0      M/c"
-               echo "100644 $o1 0      M/d/e"
-               echo "100644 $o1 0      a"
-               echo "100644 $o1 0      a1/a"
-               echo "100644 $o0 0      a1/b"
-               echo "100644 $o0 0      a1/c"
-               echo "100644 $o1 0      a1/d/e"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
+               echo "100644 $o1 0      M/a" &&
+               echo "100644 $o0 0      M/b" &&
+               echo "100644 $o0 0      M/c" &&
+               echo "100644 $o1 0      M/d/e" &&
+               echo "100644 $o1 0      a" &&
+               echo "100644 $o1 0      a1/a" &&
+               echo "100644 $o0 0      a1/b" &&
+               echo "100644 $o0 0      a1/c" &&
+               echo "100644 $o1 0      a1/d/e" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
                echo "100644 $o1 0      d/e"
        ) >expected &&
        test_cmp expected actual &&
@@ -497,21 +497,21 @@ test_expect_success 'reset and bind merge' '
        git read-tree --prefix=z/ master &&
        git ls-files -s >actual &&
        (
-               echo "100644 $o1 0      M/a"
-               echo "100644 $o0 0      M/b"
-               echo "100644 $o0 0      M/c"
-               echo "100644 $o1 0      M/d/e"
-               echo "100644 $o1 0      a"
-               echo "100644 $o1 0      a1/a"
-               echo "100644 $o0 0      a1/b"
-               echo "100644 $o0 0      a1/c"
-               echo "100644 $o1 0      a1/d/e"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
-               echo "100644 $o1 0      d/e"
-               echo "100644 $o1 0      z/a"
-               echo "100644 $o0 0      z/b"
-               echo "100644 $o0 0      z/c"
+               echo "100644 $o1 0      M/a" &&
+               echo "100644 $o0 0      M/b" &&
+               echo "100644 $o0 0      M/c" &&
+               echo "100644 $o1 0      M/d/e" &&
+               echo "100644 $o1 0      a" &&
+               echo "100644 $o1 0      a1/a" &&
+               echo "100644 $o0 0      a1/b" &&
+               echo "100644 $o0 0      a1/c" &&
+               echo "100644 $o1 0      a1/d/e" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
+               echo "100644 $o1 0      d/e" &&
+               echo "100644 $o1 0      z/a" &&
+               echo "100644 $o0 0      z/b" &&
+               echo "100644 $o0 0      z/c" &&
                echo "100644 $o1 0      z/d/e"
        ) >expected &&
        test_cmp expected actual
@@ -589,8 +589,8 @@ test_expect_success 'merge-recursive simple w/submodule result' '
 
        git ls-files -s >actual &&
        (
-               echo "100644 $o5 0      a"
-               echo "100644 $o0 0      c"
+               echo "100644 $o5 0      a" &&
+               echo "100644 $o0 0      c" &&
                echo "160000 $c1 0      d"
        ) >expected &&
        test_cmp expected actual
@@ -601,13 +601,13 @@ test_expect_success 'merge-recursive copy vs. rename' '
        git merge rename &&
        ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 blob $o0   e"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
-               echo "100644 $o0 0      d/e"
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 blob $o0   e" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
+               echo "100644 $o0 0      d/e" &&
                echo "100644 $o0 0      e"
        ) >expected &&
        test_cmp expected actual
@@ -617,17 +617,17 @@ test_expect_failure 'merge-recursive rename vs. rename/symlink' '
 
        git checkout -f rename &&
        git merge rename-ln &&
-       ( git ls-tree -r HEAD ; git ls-files -s ) >actual &&
+       ( git ls-tree -r HEAD && git ls-files -s ) >actual &&
        (
-               echo "120000 blob $oln  a"
-               echo "100644 blob $o0   b"
-               echo "100644 blob $o0   c"
-               echo "100644 blob $o0   d/e"
-               echo "100644 blob $o0   e"
-               echo "120000 $oln 0     a"
-               echo "100644 $o0 0      b"
-               echo "100644 $o0 0      c"
-               echo "100644 $o0 0      d/e"
+               echo "120000 blob $oln  a" &&
+               echo "100644 blob $o0   b" &&
+               echo "100644 blob $o0   c" &&
+               echo "100644 blob $o0   d/e" &&
+               echo "100644 blob $o0   e" &&
+               echo "120000 $oln 0     a" &&
+               echo "100644 $o0 0      b" &&
+               echo "100644 $o0 0      c" &&
+               echo "100644 $o0 0      d/e" &&
                echo "100644 $o0 0      e"
        ) >expected &&
        test_cmp expected actual