Permalink
Browse files

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>
  • Loading branch information...
1 parent dc92cc2 commit d88593fa0412a4f0a363860d879e97635c118616 @gitster gitster committed Jun 14, 2008
Showing with 0 additions and 4 deletions.
  1. +0 −4 t/t4126-apply-empty.sh
View
4 t/t4126-apply-empty.sh
@@ -26,15 +26,13 @@ test_expect_success setup '
test_expect_success 'apply empty' '
git reset --hard &&
- >empty &&
rm -f missing &&
git apply patch0 &&
test_cmp expect empty
'
test_expect_success 'apply --index empty' '
git reset --hard &&
- >empty &&
rm -f missing &&
git apply --index patch0 &&
test_cmp expect empty &&
@@ -43,15 +41,13 @@ 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
'
test_expect_success 'apply --index create' '
git reset --hard &&
- >empty &&
rm -f missing &&
git apply --index patch1 &&
test_cmp expect missing &&

0 comments on commit d88593f

Please sign in to comment.