[PATCH v2 2/2] Windows: do not treat a path with backslashes as a remote's nick name
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- May 22, 2017, 19:01 UTC
- Message-ID
- <b2fa1cff-9902-5bef-0392-1371bf1f4268@kdbg.org>
- In-Reply-To
- <7b1f97ff-52b7-72c3-211f-e73dce562911@kdbg.org>
Fetching from a remote using a native Windows path produces these warnings:
C:\Temp\gittest>git fetch C:\Temp\gittest warning: unable to access '.git/remotes/C:\Temp\gittest': Invalid argument warning: unable to access '.git/branches/C:\Temp\gittest': Invalid argument From C:\Temp\gittest * branch HEAD -> FETCH_HEAD
The functions that read the branches and remotes files are protected by a valid_remote_nick() check. Its implementation does not take Windows paths into account, so that the caller simply concatenates the paths, leading to the error seen above.
Use is_dir_sep() to check for both slashes and backslashes on Windows.
Signed-off-by: Johannes Sixt <j6t@kdbg.org> --- This v2 writes your suggested comment in front of the loop (not just the 'if' because then I feel I would have to add braces).
remote.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/remote.c b/remote.c index ad6c5424ed..1949882c10 100644 --- a/remote.c +++ b/remote.c @@ -645,7 +645,12 @@ static int valid_remote_nick(const char *name) { if (!name[0] || is_dot_or_dotdot(name)) return 0; - return !strchr(name, '/'); /* no slash */ + + /* remote nicknames cannot contain slashes */ + while (*name) + if (is_dir_sep(*name++)) + return 0; + return 1; } const char *remote_for_branch(struct branch *branch, int *explicit)
-- 2.13.0.55.g17b7d13330