Re: *[PATCH] builtin-commit: Refresh cache after adding files.
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 10, 2007, 01:40 UTC
- Message-ID
- <7v640ari76.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <7vhcjvtgz5.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 7 quoted lines
> This discussion exposes a problem with add_files_to_cache() > function. > ... > And add_file_to_cache(), which calls add_file_to_index() on > the_index, does call the fill_stat_cache_info() to sync the stat > information by itself, as it should be. I am still puzzled with > this.
Blech. I think it is 0781b8a9b2fe760fc4ed519a3a26e4b9bd6ccffe (add_file_to_index: skip rehashing if the cached stat already matches) that broke "git add". I get the same problem not just with "git add -u" but also with an explicit "git add Makefile".
In add_file_to_index(), we check if ie_modified() says if the path is modified, but that is actually a very wrong check in that function. ie_modified() knows the racy git condition and digs deeper to find if the file in the work tree is really different. We end up saying "ah, Ok, if that is the same, then we do not add it to the index again", which is why we do not update the stat info in this case.
Instead, we should ask ie_match_stat() which answers "does not match" for a entry that _could_ be racily clean, so that we make sure we re-add such an entry to clear the stat info.
This applies to maint and all the way up.
I also suspect that run_diff_files() that is called from builtin-add.c:update() needs to tell ie_match_stat() to assume that a racily clean path is unclean (that is what bit (1<<1) of the third parameter to ie_match_stat() is about), so that "add -u" will call the add_file_to_index() function, but that would be a bigger patch.
---
read-cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/read-cache.c b/read-cache.c index 928e8fa..75e2d46 100644 --- a/read-cache.c +++ b/read-cache.c @@ -420,7 +420,7 @@ int add_file_to_index(struct index_state *istate, const char *path, int verbose) pos = index_name_pos(istate, ce->name, namelen); if (0 <= pos && !ce_stage(istate->cache[pos]) && - !ie_modified(istate, istate->cache[pos], &st, 1)) { + !ie_match_stat(istate, istate->cache[pos], &st, 3)) { /* Nothing changed, really */ free(ce); return 0;