git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/3] setup_git_directory(): handle UNC root paths correctly

From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
Date
Aug 24, 2019, 22:10 UTC
Message-ID
<80b5535dc096a6ce0efac5aa4adf7a933fc22062.1566684643.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.141.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>

When working in the root directory of a file share (this is only possible in Git Bash and Powershell, but not in CMD), the current directory is reported without a trailing slash.

This is different from Unix and standard Windows directories: both / and C:\ are reported with a trailing slash as current directories.

If a Git worktree is located there, Git is not quite prepared for that: while it does manage to find the .git directory/file, it returns as length of the top-level directory's path *one more* than the length of the current directory, and setup_git_directory_gently() would then return an undefined string as prefix.

In practice, this undefined string usually points to NUL bytes, and does not cause much harm. Under rare circumstances that are really involved to reproduce (and not reliably so), the reported prefix could be a suffix string of Git's exec path, though.

A careful analysis determined that this bug is unlikely to be exploitable, therefore we mark this as a regular bug fix.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.c b/setup.c
index 3d24de15dd..c8c6bf3f49 100644
--- a/setup.c
+++ b/setup.c
@@ -784,7 +784,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
 		set_git_dir(gitdir);
 	inside_git_dir = 0;
 	inside_work_tree = 1;
-	if (offset == cwd->len)
+	if (offset >= cwd->len)
 		return NULL;
 
 	/* Make "offset" point past the '/' (already the case for root dirs) */
-- 
gitgitgadget
Previous: Johannes Schindelin via GitGitGadgetNext: Junio C Hamano
Message 4 of 5 in “Handle worktrees at the top of a network drive”
  1. 0/3 Handle worktrees at the top of a network driveJohannes Schindelin via GitGitGadget, Aug 24, 2019
  2. 1/3 setup_git_directory(): handle UNC paths correctlyJohannes Schindelin via GitGitGadget, Aug 24, 2019
  3. 2/3 Fix .git/ discovery at the root of UNC sharesJohannes Schindelin via GitGitGadget, Aug 24, 2019
  4. 3/3 setup_git_directory(): handle UNC root paths correctlyJohannes Schindelin via GitGitGadget, Aug 24, 2019
  5. Junio C HamanoAug 26, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.