Skip to content

Commit 6fd8b80

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
Fix .git/ discovery at the root of UNC shares
A very common assumption in Git's source code base is that offset_1st_component() returns either 0 for relative paths, or 1 for absolute paths that start with a slash. In other words, the return value is either 0 or points just after the dir separator. This assumption is not fulfilled when calling offset_1st_component() e.g. on UNC paths on Windows, e.g. "//my-server/my-share". In this case, offset_1st_component() returns the length of the entire string (which is correct, because stripping the last "component" would not result in a valid directory), yet the return value still does not point just after a dir separator. This assumption is most prominently seen in the setup_git_directory_gently_1() function, where we want to append a ".git" component and simply assume that there is already a dir separator. In the UNC example given above, this assumption is incorrect. As a consequence, Git will fail to handle a worktree at the top of a UNC share correctly. Let's fix this by adding a dir separator specifically for that case: we found that there is no first component in the path and it does not end in a dir separator? Then add it. This fixes #1320 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 18a6cec commit 6fd8b80

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

setup.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,12 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
947947
if (ceil_offset < 0)
948948
ceil_offset = min_offset - 2;
949949

950+
if (min_offset && min_offset == dir->len &&
951+
!is_dir_sep(dir->buf[min_offset - 1])) {
952+
strbuf_addch(dir, '/');
953+
min_offset++;
954+
}
955+
950956
/*
951957
* Test in the following order (relative to the dir):
952958
* - .git (file containing "gitdir: <path>")

0 commit comments

Comments
 (0)