Merge branch 'jc/clean-after-sanity-tests'

diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index bec0192c3b71085805ee5c9aa5f92ffd3ee8fbff..1cbd946fc2eb9ab3dcad83c811abb6d18448fc4e 100755 (executable)
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -38,7 +38,7 @@ test_expect_success "Does git preserve Gollum's precious artifact?" '
                test_must_fail git merge -s recursive rename-the-ring &&
 
                # Make sure git did not delete an untracked file
-               test -f ring
+               test_path_is_file ring
        )
 '
 
@@ -80,8 +80,11 @@ test_expect_failure 'rename/modify/add-source conflict resolvable' '
 
                git merge -s recursive C^0 &&
 
-               test $(git rev-parse B:a) = $(git rev-parse b) &&
-               test $(git rev-parse C:a) = $(git rev-parse a)
+               git rev-parse >expect \
+                       B:a   C:a     &&
+               git rev-parse >actual \
+                       b     c       &&
+               test_cmp expect actual
        )
 '
 
@@ -116,13 +119,19 @@ test_expect_failure 'conflict caused if rename not detected' '
                git checkout -q C^0 &&
                git merge -s recursive B^0 &&
 
-               test 3 -eq $(git ls-files -s | wc -l) &&
-               test 0 -eq $(git ls-files -u | wc -l) &&
-               test 0 -eq $(git ls-files -o | wc -l) &&
+               git ls-files -s >out &&
+               test_line_count = 3 out &&
+               git ls-files -u >out &&
+               test_line_count = 0 out &&
+               git ls-files -o >out &&
+               test_line_count = 1 out &&
 
                test_line_count = 6 c &&
-               test $(git rev-parse HEAD:a) = $(git rev-parse B:a) &&
-               test $(git rev-parse HEAD:b) = $(git rev-parse A:b)
+               git rev-parse >expect \
+                       B:a   A:b     &&
+               git rev-parse >actual \
+                       :0:a  :0:b    &&
+               test_cmp expect actual
        )
 '
 
@@ -203,15 +212,21 @@ test_expect_failure 'detect rename/add-source and preserve all data' '
 
                git merge -s recursive C^0 &&
 
-               test 2 -eq $(git ls-files -s | wc -l) &&
-               test 2 -eq $(git ls-files -u | wc -l) &&
-               test 0 -eq $(git ls-files -o | wc -l) &&
-
-               test -f a &&
-               test -f b &&
-
-               test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
-               test $(git rev-parse HEAD:a) = $(git rev-parse C:a)
+               git ls-files -s >out &&
+               test_line_count = 2 out &&
+               git ls-files -u >out &&
+               test_line_count = 2 out &&
+               git ls-files -o >out &&
+               test_line_count = 1 out &&
+
+               test_path_is_file a &&
+               test_path_is_file b &&
+
+               git rev-parse >expect \
+                       A:a   C:a     &&
+               git rev-parse >actual \
+                       :0:b  :0:a    &&
+               test_cmp expect actual
        )
 '
 
@@ -223,15 +238,21 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other
 
                git merge -s recursive B^0 &&
 
-               test 2 -eq $(git ls-files -s | wc -l) &&
-               test 2 -eq $(git ls-files -u | wc -l) &&
-               test 0 -eq $(git ls-files -o | wc -l) &&
-
-               test -f a &&
-               test -f b &&
-
-               test $(git rev-parse HEAD:b) = $(git rev-parse A:a) &&
-               test $(git rev-parse HEAD:a) = $(git rev-parse C:a)
+               git ls-files -s >out &&
+               test_line_count = 2 out &&
+               git ls-files -u >out &&
+               test_line_count = 2 out &&
+               git ls-files -o >out &&
+               test_line_count = 1 out &&
+
+               test_path_is_file a &&
+               test_path_is_file b &&
+
+               git rev-parse >expect \
+                       A:a   C:a     &&
+               git rev-parse >actual \
+                       :0:b  :0:a    &&
+               test_cmp expect actual
        )
 '
 
@@ -279,9 +300,12 @@ test_expect_success 'rename/directory conflict + clean content merge' '
 
                test_must_fail git merge -s recursive right^0 &&
 
-               test 2 -eq $(git ls-files -s | wc -l) &&
-               test 1 -eq $(git ls-files -u | wc -l) &&
-               test 1 -eq $(git ls-files -o | wc -l) &&
+               git ls-files -s >out &&
+               test_line_count = 2 out &&
+               git ls-files -u >out &&
+               test_line_count = 1 out &&
+               git ls-files -o >out &&
+               test_line_count = 2 out &&
 
                echo 0 >expect &&
                git cat-file -p base:file >>expect &&
@@ -290,8 +314,8 @@ test_expect_success 'rename/directory conflict + clean content merge' '
 
                test $(git rev-parse :2:newfile) = $(git hash-object expect) &&
 
-               test -f newfile/realfile &&
-               test -f newfile~HEAD
+               test_path_is_file newfile/realfile &&
+               test_path_is_file newfile~HEAD
        )
 '
 
@@ -307,9 +331,12 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
 
                test_must_fail git merge -s recursive right^0 &&
 
-               test 4 -eq $(git ls-files -s | wc -l) &&
-               test 3 -eq $(git ls-files -u | wc -l) &&
-               test 1 -eq $(git ls-files -o | wc -l) &&
+               git ls-files -s >out &&
+               test_line_count = 4 out &&
+               git ls-files -u >out &&
+               test_line_count = 3 out &&
+               git ls-files -o >out &&
+               test_line_count = 2 out &&
 
                git cat-file -p left-conflict:newfile >left &&
                git cat-file -p base:file    >base &&
@@ -321,12 +348,14 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
                        left base right &&
                test_cmp left newfile~HEAD &&
 
-               test $(git rev-parse :1:newfile) = $(git rev-parse base:file) &&
-               test $(git rev-parse :2:newfile) = $(git rev-parse left-conflict:newfile) &&
-               test $(git rev-parse :3:newfile) = $(git rev-parse right:file) &&
+               git rev-parse >expect                                 \
+                       base:file   left-conflict:newfile  right:file &&
+               git rev-parse >actual                                 \
+                       :1:newfile  :2:newfile             :3:newfile &&
+               test_cmp expect actual
 
-               test -f newfile/realfile &&
-               test -f newfile~HEAD
+               test_path_is_file newfile/realfile &&
+               test_path_is_file newfile~HEAD
        )
 '
 
@@ -367,16 +396,19 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '
 
                git merge -s recursive right^0 &&
 
-               test 1 -eq $(git ls-files -s | wc -l) &&
-               test 0 -eq $(git ls-files -u | wc -l) &&
-               test 0 -eq $(git ls-files -o | wc -l) &&
+               git ls-files -s >out &&
+               test_line_count = 1 out &&
+               git ls-files -u >out &&
+               test_line_count = 0 out &&
+               git ls-files -o >out &&
+               test_line_count = 1 out &&
 
                echo 0 >expect &&
                git cat-file -p base:sub/file >>expect &&
                echo 7 >>expect &&
                test_cmp expect sub &&
 
-               test -f sub
+               test_path_is_file sub
        )
 '
 
@@ -426,18 +458,25 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
                test_must_fail git merge -s recursive C^0 >out &&
                test_i18ngrep "CONFLICT (rename/rename)" out &&
 
-               test 2 -eq $(git ls-files -s | wc -l) &&
-               test 2 -eq $(git ls-files -u | wc -l) &&
-               test 2 -eq $(git ls-files -u c | wc -l) &&
-               test 3 -eq $(git ls-files -o | wc -l) &&
-
-               test ! -f a &&
-               test ! -f b &&
-               test -f c~HEAD &&
-               test -f c~C^0 &&
-
-               test $(git hash-object c~HEAD) = $(git rev-parse C:a) &&
-               test $(git hash-object c~C^0) = $(git rev-parse B:b)
+               git ls-files -s >out &&
+               test_line_count = 2 out &&
+               git ls-files -u >out &&
+               test_line_count = 2 out &&
+               git ls-files -u c >out &&
+               test_line_count = 2 out &&
+               git ls-files -o >out &&
+               test_line_count = 3 out &&
+
+               test_path_is_missing a &&
+               test_path_is_missing b &&
+               test_path_is_file c~HEAD &&
+               test_path_is_file c~C^0 &&
+
+               git rev-parse >expect   \
+                       C:a     B:b     &&
+               git hash-object >actual \
+                       c~HEAD  c~C^0   &&
+               test_cmp expect actual
        )
 '
 
@@ -476,17 +515,22 @@ test_expect_success 'merge has correct working tree contents' '
 
                test_must_fail git merge -s recursive B^0 &&
 
-               test 3 -eq $(git ls-files -s | wc -l) &&
-               test 3 -eq $(git ls-files -u | wc -l) &&
-               test 0 -eq $(git ls-files -o | wc -l) &&
-
-               test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
-               test $(git rev-parse :3:b) = $(git rev-parse A:a) &&
-               test $(git rev-parse :2:c) = $(git rev-parse A:a) &&
-
-               test ! -f a &&
-               test $(git hash-object b) = $(git rev-parse A:a) &&
-               test $(git hash-object c) = $(git rev-parse A:a)
+               git ls-files -s >out &&
+               test_line_count = 3 out &&
+               git ls-files -u >out &&
+               test_line_count = 3 out &&
+               git ls-files -o >out &&
+               test_line_count = 1 out &&
+
+               test_path_is_missing a &&
+               git rev-parse >expect   \
+                       A:a   A:a   A:a \
+                       A:a   A:a       &&
+               git rev-parse >actual    \
+                       :1:a  :3:b  :2:c &&
+               git hash-object >>actual \
+                       b     c          &&
+               test_cmp expect actual
        )
 '
 
@@ -527,17 +571,20 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'
 
                test_must_fail git merge -s recursive C^0 &&
 
-               test 4 -eq $(git ls-files -s | wc -l) &&
-               test 0 -eq $(git ls-files -o | wc -l) &&
+               git ls-files -s >out &&
+               test_line_count = 4 out &&
+               git ls-files -o >out &&
+               test_line_count = 1 out &&
 
-               test $(git rev-parse 3:a) = $(git rev-parse C:a) &&
-               test $(git rev-parse 1:a) = $(git rev-parse A:a) &&
-               test $(git rev-parse 2:b) = $(git rev-parse B:b) &&
-               test $(git rev-parse 3:c) = $(git rev-parse C:c) &&
+               git rev-parse >expect         \
+                       C:a   A:a   B:b   C:C &&
+               git rev-parse >actual          \
+                       :3:a  :1:a  :2:b  :3:c &&
+               test_cmp expect actual
 
-               test -f a &&
-               test -f b &&
-               test -f c
+               test_path_is_file a &&
+               test_path_is_file b &&
+               test_path_is_file c
        )
 '
 
@@ -573,11 +620,16 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' '
                git checkout C^0 &&
                git merge -s recursive B^0 &&
 
-               test 2 -eq $(git ls-files -s | wc -l) &&
-               test 0 -eq $(git ls-files -o | wc -l) &&
+               git ls-files -s >out &&
+               test_line_count = 2 out &&
+               git ls-files -o >out &&
+               test_line_count = 1 out &&
 
-               test $(git rev-parse HEAD:a) = $(git rev-parse C:a) &&
-               test $(git rev-parse HEAD:b) = $(git rev-parse A:a)
+               git rev-parse >expect \
+                       C:a   A:a     &&
+               git rev-parse >actual \
+                       :0:a  :0:b    &&
+               test_cmp expect actual
        )
 '
 
@@ -615,24 +667,29 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
                git checkout C^0 &&
                test_must_fail git merge -s recursive B^0 &&
 
-               test 5 -eq $(git ls-files -s | wc -l) &&
-               test 2 -eq $(git ls-files -u b | wc -l) &&
-               test 2 -eq $(git ls-files -u c | wc -l) &&
-               test 4 -eq $(git ls-files -o | wc -l) &&
-
-               test $(git rev-parse :1:a) = $(git rev-parse A:a) &&
-               test $(git rev-parse :2:b) = $(git rev-parse C:b) &&
-               test $(git rev-parse :3:b) = $(git rev-parse B:b) &&
-               test $(git rev-parse :2:c) = $(git rev-parse C:c) &&
-               test $(git rev-parse :3:c) = $(git rev-parse B:c) &&
-
-               test $(git hash-object c~HEAD) = $(git rev-parse C:c) &&
-               test $(git hash-object c~B\^0) = $(git rev-parse B:c) &&
-               test $(git hash-object b~HEAD) = $(git rev-parse C:b) &&
-               test $(git hash-object b~B\^0) = $(git rev-parse B:b) &&
-
-               test ! -f b &&
-               test ! -f c
+               git ls-files -s >out &&
+               test_line_count = 5 out &&
+               git ls-files -u b >out &&
+               test_line_count = 2 out &&
+               git ls-files -u c >out &&
+               test_line_count = 2 out &&
+               git ls-files -o >out &&
+               test_line_count = 5 out &&
+
+               git rev-parse >expect               \
+                       A:a   C:b   B:b   C:c   B:c &&
+               git rev-parse >actual                \
+                       :1:a  :2:b  :3:b  :2:c  :3:c &&
+               test_cmp expect actual
+
+               git rev-parse >expect               \
+                       C:c     B:c     C:b     B:b &&
+               git hash-object >actual                \
+                       c~HEAD  c~B\^0  b~HEAD  b~B\^0 &&
+               test_cmp expect actual
+
+               test_path_is_missing b &&
+               test_path_is_missing c
        )
 '