| commit | 60f20d4bb4f56ae90967d810ffb042e9f76b310d | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Fri, 30 Jul 2010 18:31:22 +0000 (30 13:31 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 4 Aug 2010 18:21:14 +0000 (4 11:21 -0700) | ||
| tree | 2619bc9cb1966fc402189c2fb4eec65cd1c717cd | treesnapshot (tar.gz zip) |
| parent | 60c98d1e80a65c9a893733f7bceda463ef3cb6f7 | commitdiff |
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>
"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>
| t/t4111-apply-subdir.sh | diffblobblamehistory |