From: Junio C Hamano Date: Wed, 27 Jun 2012 18:28:21 GMT Subject: Re: Bug: problem with file named with dash character Message-ID: <7vk3ys8v96.fsf@alter.siamese.dyndns.org> In-Reply-To: <80a7ce17-3ee7-4f09-b984-b6685e163b87@office.digitalus.nl> Daniel Lyubomirov -|- Digitalus Bulgaria writes: > Аccidentally my colleague created a file in the root dir of the git repo called - (just dash). > As result for every commit having this file, diff , merge, cherry-pick maybe others just hang. Thanks for a report. I think the "diff" callchain should be refactored so that the caller can mark the special "stdin" token in a saner way, but until it happens, the following one-liner should do. diff.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/diff.c b/diff.c index 1a594df..caa2309 100644 --- a/diff.c +++ b/diff.c @@ -2589,6 +2589,14 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int if (!FAST_WORKING_DIRECTORY && !want_file && has_sha1_pack(sha1)) return 0; + /* + * And asking to read "-" from the working tree triggers stdin + * input (which needs to be fixed separately by refactoring the + * callchain), forbid "reuse" for now. + */ + if (!strcmp(name, "-")) + return 0; + len = strlen(name); pos = cache_name_pos(name, len); if (pos < 0)