summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-13 17:16:02 -0700
committerJunio C Hamano <gitster@pobox.com>2008-06-13 22:07:34 -0700
commitd88593fa0412a4f0a363860d879e97635c118616 (patch)
tree732e59576a4fa740aad1950ce5bdb86043f076e6 /t
parentdc92cc20f8dcfefcd5d79e8550736bcc437ea2e4 (diff)
downloadgit-d88593fa0412a4f0a363860d879e97635c118616.tar.gz
t4126: fix test that happened to work due to timing
The test did "reset --hard" (where the HEAD commit has an empty blob at path "empty") followed by "> empty", expecting that the index does not notice the file _changed_ since git wrote it out upon "reset" if the redirection is done quickly enough. There was no need to do the emptying, and it gave a wrong result if "reset --hard" happened on time T and then ">empty" happened on the next second T+1. This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4126-apply-empty.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/t/t4126-apply-empty.sh b/t/t4126-apply-empty.sh
index 0cfd47cfcf..ceb6a79fe0 100755
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@ -26,7 +26,6 @@ test_expect_success setup '
test_expect_success 'apply empty' '
git reset --hard &&
- >empty &&
rm -f missing &&
git apply patch0 &&
test_cmp expect empty
@@ -34,7 +33,6 @@ test_expect_success 'apply empty' '
test_expect_success 'apply --index empty' '
git reset --hard &&
- >empty &&
rm -f missing &&
git apply --index patch0 &&
test_cmp expect empty &&
@@ -43,7 +41,6 @@ test_expect_success 'apply --index empty' '
test_expect_success 'apply create' '
git reset --hard &&
- >empty &&
rm -f missing &&
git apply patch1 &&
test_cmp expect missing
@@ -51,7 +48,6 @@ test_expect_success 'apply create' '
test_expect_success 'apply --index create' '
git reset --hard &&
- >empty &&
rm -f missing &&
git apply --index patch1 &&
test_cmp expect missing &&