undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GIT_CEILING_DIRECTORIES on Windows

Browse Source 
Using git with GIT_CEILING_DIRECTORIES crashed on Windows due to a failed
assertion in normalize_absolute_path(): This function expects absolute
paths to start with a slash, while on Windows they can start with a drive
letter or a backslash.

This fixes it by using the alternative, normalize_path_copy() instead,
which can handle Windows-style paths just fine.

Secondly, the portability macro PATH_SEP is used instead of expecting
colons to be used as path list delimiter.

The test script t1504 is also changed to help MSYS's bash recognize some
program arguments as path list. (MSYS's bash must translate POSIX-style
path lists to Windows-style path lists, and the heuristic did not catch
some cases.)

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2009-02-07 16:08:29 +01:00 committed by Junio C Hamano
parent f3cad0ad82
commit 43a7ddb55d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
path.c
View File

@ -524,15 +524,16 @@ int longest_ancestor_length(const char *path, const char *prefix_list)
return -1; return -1;
for (colon = ceil = prefix_list; *colon; ceil = colon+1) { for (colon = ceil = prefix_list; *colon; ceil = colon+1) {
for (colon = ceil; *colon && *colon != ':'; colon++); for (colon = ceil; *colon && *colon != PATH_SEP; colon++);
len = colon - ceil; len = colon - ceil;
if (len == 0 || len > PATH_MAX || !is_absolute_path(ceil)) if (len == 0 || len > PATH_MAX || !is_absolute_path(ceil))
continue; continue;
strlcpy(buf, ceil, len+1); strlcpy(buf, ceil, len+1);
len = normalize_absolute_path(buf, buf); if (normalize_path_copy(buf, buf) < 0)
/* Strip "trailing slashes" from "/". */ continue;
if (len == 1) len = strlen(buf);
len = 0; if (len > 0 && buf[len-1] == '/')
buf[--len] = '\0';
if (!strncmp(path, buf, len) && if (!strncmp(path, buf, len) &&
path[len] == '/' && path[len] == '/' &&

6
t/t1504-ceiling-dirs.sh
View File

@ -93,13 +93,13 @@ GIT_CEILING_DIRECTORIES="$TRASH_ROOT/subdi"
test_prefix subdir_ceil_at_subdi_slash "sub/dir/" test_prefix subdir_ceil_at_subdi_slash "sub/dir/"
GIT_CEILING_DIRECTORIES="foo:$TRASH_ROOT/sub" GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub"
test_fail second_of_two test_fail second_of_two
GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub:bar" GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub:/bar"
test_fail first_of_two test_fail first_of_two
GIT_CEILING_DIRECTORIES="foo:$TRASH_ROOT/sub:bar" GIT_CEILING_DIRECTORIES="/foo:$TRASH_ROOT/sub:/bar"
test_fail second_of_three test_fail second_of_three