diff options
author | Jeff King <peff@peff.net> | 2015-03-20 13:07:15 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 20:20:14 +0300 |
commit | 99094a7ad484085b9f6849a8ebe1e23467c5bc14 (patch) | |
tree | c47fba4be6766c5ec5bec48108fe1e96ce22bb40 /t/t6022-merge-rename.sh | |
parent | 60687de5ba3eb90f8332fb1bcec73a2cb782c95c (diff) |
t: fix trivial &&-chain breakage
These are tests which are missing a link in their &&-chain,
but during a setup phase. We may fail to notice failure in
commands that build the test environment, but these are
typically not expected to fail at all (but it's still good
to double-check that our test environment is what we
expect).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6022-merge-rename.sh')
-rwxr-xr-x | t/t6022-merge-rename.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index a89dfbef08..05ebba7afa 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -685,7 +685,7 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' ' git add -A && git commit -mA && - git checkout -b side + git checkout -b side && git rm -rf df && git commit -mB && @@ -716,7 +716,7 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' ' git add -A && git commit -mA && - git checkout -b side + git checkout -b side && git rm -f file && git commit -m "Delete file" && @@ -745,7 +745,7 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' ' git add -A && git commit -mA && - git checkout -b side + git checkout -b side && cp file newfile && git add -A && git commit -m "Add file copy" && |