mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-cache: let refresh_cache_ent pass up changed flags

Browse Source 
This will enable refresh_cache to differentiate more cases
of modification (such as typechange) when telling the user
what isn't fresh.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2011-11-18 06:11:08 -05:00
committed by Junio C Hamano
parent bc1bbe0c19
commit d05e697010
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
read-cache.c
View File

@ -1001,7 +1001,8 @@ int add_index_entry(struct index_state *istate, struct cache_entry *ce, int opti
*/ */
static struct cache_entry *refresh_cache_ent(struct index_state *istate, static struct cache_entry *refresh_cache_ent(struct index_state *istate,
struct cache_entry *ce, struct cache_entry *ce,
unsigned int options, int *err) unsigned int options, int *err,
int *changed_ret)
{ {
struct stat st; struct stat st;
struct cache_entry *updated; struct cache_entry *updated;
@ -1033,6 +1034,8 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
} }
changed = ie_match_stat(istate, ce, &st, options); changed = ie_match_stat(istate, ce, &st, options);
if (changed_ret)
*changed_ret = changed;
if (!changed) { if (!changed) {
/* /*
* The path is unchanged. If we were told to ignore * The path is unchanged. If we were told to ignore
@ -1130,7 +1133,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen)) if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
continue; continue;
new = refresh_cache_ent(istate, ce, options, &cache_errno); new = refresh_cache_ent(istate, ce, options, &cache_errno, NULL);
if (new == ce) if (new == ce)
continue; continue;
if (!new) { if (!new) {
@ -1157,7 +1160,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p
static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really) static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
{ {
return refresh_cache_ent(&the_index, ce, really, NULL); return refresh_cache_ent(&the_index, ce, really, NULL, NULL);
} }
static int verify_hdr(struct cache_header *hdr, unsigned long size) static int verify_hdr(struct cache_header *hdr, unsigned long size)