git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: lars.schneider@autodesk.com
To: git@vger.kernel.org
Cc: peff@peff.net, t.gummerer@gmail.com, jrnieder@gmail.com,
	gitster@pobox.com, Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v1 1/2] entry.c: update cache entry only for existing files
Date: Thu,  5 Oct 2017 12:44:06 +0200	[thread overview]
Message-ID: <20171005104407.65948-2-lars.schneider@autodesk.com> (raw)
In-Reply-To: <20171005104407.65948-1-lars.schneider@autodesk.com>

From: Lars Schneider <larsxschneider@gmail.com>

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 <peff@peff.net>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
 entry.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/entry.c b/entry.c
index 1c7e3c11d5..5dab656364 100644
--- a/entry.c
+++ b/entry.c
@@ -304,7 +304,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(
@@ -360,6 +360,7 @@ static int write_entry(struct cache_entry *ce,
 		ce->ce_flags |= CE_UPDATE_IN_BASE;
 		state->istate->cache_changed |= CE_ENTRY_CHANGED;
 	}
+delayed:
 	return 0;
 }
 
-- 
2.14.2


  reply	other threads:[~2017-10-05 10:45 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-05 10:44 [PATCH v1 0/2] fix temporary garbage in the cache entry lars.schneider
2017-10-05 10:44 ` lars.schneider [this message]
2017-10-05 11:12   ` [PATCH v1 1/2] entry.c: update cache entry only for existing files Jeff King
2017-10-05 11:19   ` Junio C Hamano
2017-10-05 11:26     ` Jeff King
2017-10-05 23:01       ` Junio C Hamano
2017-10-06  4:54         ` Jeff King
2017-10-08 21:37           ` Lars Schneider
2017-10-09 17:47             ` Jeff King
2017-10-09 17:48               ` [PATCH 1/3] write_entry: fix leak when retrying delayed filter Jeff King
2017-10-10  0:00                 ` Junio C Hamano
2017-10-10  9:23                   ` Simon Ruderich
2017-10-10  9:25                     ` Jeff King
2017-10-10  9:49                       ` Simon Ruderich
2017-10-09 17:48               ` [PATCH 2/3] write_entry: avoid reading blobs in CE_RETRY case Jeff King
2017-10-10  0:00                 ` Junio C Hamano
2017-10-09 17:50               ` [PATCH 3/3] write_entry: untangle symlink and regular-file cases Jeff King
2017-10-10  0:03                 ` Junio C Hamano
2017-10-05 10:44 ` [PATCH v1 2/2] entry.c: check if file exists after checkout lars.schneider
2017-10-05 11:23   ` Jeff King
2017-10-06  4:26     ` Junio C Hamano
2017-10-06  4:56       ` Jeff King
2017-10-06  6:03         ` Junio C Hamano
2017-10-06  6:05           ` Jeff King
2017-10-06  7:58             ` Junio C Hamano
2017-10-08 21:41         ` Lars Schneider

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171005104407.65948-2-lars.schneider@autodesk.com \
    --to=lars.schneider@autodesk.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=larsxschneider@gmail.com \
    --cc=peff@peff.net \
    --cc=t.gummerer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).