From 03b95333db32ea92b8a4a61f2f055a900f8d7c84 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Thu, 5 Oct 2017 12:44:06 +0200 Subject: entry.c: update cache entry only for existing files In 2841e8f ("convert: add "status=delayed" to filter process protocol", 2017-06-30) we taught the filter process protocol to delay responses. That means an external filter might answer in the first write_entry() call on a file that requires filtering "I got your request, but I can't answer right now. Ask again later!". As Git got no answer, we do not write anything to the filesystem. Consequently, the lstat() call in the finish block of the function writes garbage to the cache entry. The garbage is eventually overwritten when the filter answers with the final file content in a subsequent write_entry() call. Fix the brief time window of garbage in the cache entry by adding a special finish block that does nothing for delayed responses. The cache entry is written properly in a subsequent write_entry() call where the filter responds with the final file content. Reported-by: Jeff King Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- entry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'entry.c') diff --git a/entry.c b/entry.c index 65458f07a4..f879758c73 100644 --- a/entry.c +++ b/entry.c @@ -290,7 +290,7 @@ static int write_entry(struct cache_entry *ce, ce->name, new, size, &buf, dco); if (ret && string_list_has_string(&dco->paths, ce->name)) { free(new); - goto finish; + goto delayed; } } else ret = convert_to_working_tree( @@ -346,6 +346,7 @@ finish: ce->ce_flags |= CE_UPDATE_IN_BASE; state->istate->cache_changed |= CE_ENTRY_CHANGED; } +delayed: return 0; } -- cgit v1.2.3