From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 30 Jul 2010 18:31:22 +0000 (-0500)
Subject: t4111 (apply): refresh index before applying patches to it
X-Git-Tag: v1.7.3-rc0~34^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60f20d4bb4f56ae90967d810ffb042e9f76b310d;p=git.git

t4111 (apply): refresh index before applying patches to it

"git apply", like most plumbing, does not automatically refresh the
index file even if it is only stat-dirty.  So unless the two "cp"
commands in reset_preimage() for a given file happen to have the same
time stamp, there will be a spurious

	error: sub/dir/file: does not match index

Refresh the index to eliminate this timing dependency.  Noticed by
running the test with --valgrind (which slows things down a lot).

Reported-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t4111-apply-subdir.sh b/t/t4111-apply-subdir.sh
index 60c223750..d6271ae34 100755
--- a/t/t4111-apply-subdir.sh
+++ b/t/t4111-apply-subdir.sh
@@ -36,7 +36,8 @@ test_expect_success 'setup: subdir' '
 		cp "$2" file &&
 		cp "$2" sub/dir/file &&
 		cp "$2" sub/dir/b/file &&
-		cp "$2" objects/file
+		cp "$2" objects/file &&
+		test_might_fail git update-index --refresh -q
 	}
 '