diff options
Diffstat (limited to 't/t2200-add-update.sh')
| -rwxr-xr-x | t/t2200-add-update.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index 67b9cc752f..d2ef0041f9 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -153,10 +153,10 @@ test_expect_success 'add -u resolves unmerged paths' ' echo "100644 $one 1 $path" && echo "100644 $two 2 $path" && echo "100644 $three 3 $path" - done - echo "100644 $one 1 path3" - echo "100644 $one 1 path4" - echo "100644 $one 3 path5" + done && + echo "100644 $one 1 path3" && + echo "100644 $one 1 path4" && + echo "100644 $one 3 path5" && echo "100644 $one 3 path6" } | git update-index --index-info && @@ -173,8 +173,8 @@ test_expect_success 'add -u resolves unmerged paths' ' git add -u && git ls-files -s path1 path2 path3 path4 path5 path6 >actual && { - echo "100644 $three 0 path1" - echo "100644 $two 0 path3" + echo "100644 $three 0 path1" && + echo "100644 $two 0 path3" && echo "100644 $two 0 path5" } >expect && test_cmp expect actual |