Re: [PATCH 1/4] read-cache: fix wrong 'the_index' usage
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:32
Felipe Contreras [off-list ref] writes:
We are dealing with the 'istate' index, not 'the_index'. Signed-off-by: Felipe Contreras <redacted> ---
Good catch; will apply.
quoted hunk
read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/read-cache.c b/read-cache.c index 04ed561..5253ec5 100644 --- a/read-cache.c +++ b/read-cache.c@@ -626,7 +626,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, if (*ptr == '/') { struct cache_entry *foundce; ++ptr; - foundce = index_name_exists(&the_index, ce->name, ptr - ce->name, ignore_case); + foundce = index_name_exists(istate, ce->name, ptr - ce->name, ignore_case); if (foundce) { memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr); startPtr = ptr;