Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Oct 12, 2012, 07:33 UTC
- Message-ID
- <5077C7AC.9010301@viscovery.net>
- In-Reply-To
- <7vpq4p80sn.fsf@alter.siamese.dyndns.org>
Am 10/11/2012 17:51, schrieb Junio C Hamano:
Show 13 quoted lines
> Johannes Sixt <j.sixt@viscovery.net> writes: > >> I saw EINVAL errors when 'git grep pattern rev' was run on Windows. The >> reason is that the code attempted to access "rev:dir/.gitattributes" in >> the worktree, which is an invalid path on Windows due to the colon. The >> lack of this warning indicates that the attempts to access these files are >> eliminated. > > It means that whenever we ask for attributes for a tracked file that > is inside a directory whose name contains a colon, we would get the > same error on Windows, no? Perhaps Windows may not let you create > such a directory in the first place, but you may still get a > repository of a cross platform project that contains such a path.
Your assessment is correct.
> What I am wondering is if we should do something similar to 8e950da > (attr: failure to open a .gitattributes file is OK with ENOTDIR, > 2012-09-13), at least on Windows, for EINVAL.
It might be worth it. We already have a similar special case in write_or_die.c:maybe_flush_or_die() for Windows, although it is not about a colon in a path name.
Perhaps like this.
--- 8< --- From: Johannes Sixt <j6t@kdbg.org> Subject: [PATCH] attr: do not warn on path with colon on Windows
In the same spirit as commit 8e950dab (attr: failure to open a .gitattributes file is OK with ENOTDIR), ignore EINVAL errors. On Windows, a path that contains a colon that is not the one after the drive letter is not allowed and is reported with errno set to EINVAL.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- attr.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/attr.c b/attr.c index 8010429..ac945ad 100644 --- a/attr.c +++ b/attr.c @@ -354,7 +354,15 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok) int lineno = 0; if (!fp) { - if (errno != ENOENT && errno != ENOTDIR) + /* + * If path does not exist, it is not worth mentioning, + * but I/O errors and permission errors are. + * + * On Windows, EINVAL is reported if path contains a colon + * that is not the driver letter separator. Such a path + * cannot exist in the file system and is also uninteresting. + */ + if (errno != ENOENT && errno != ENOTDIR && errno != EINVAL) warn_on_inaccessible(path); return NULL; }
-- 1.8.0.rc2.1237.g5522246