From: Johannes Schindelin Date: Mon, 13 Mar 2017 20:09:44 +0000 (+0100) Subject: setup: prepare setup_discovered_git_dir() for the root directory X-Git-Tag: v2.13.0-rc0~100^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df380d58ece2a745e4283ef4de8dfeea560546bb;p=thirdparty%2Fgit.git setup: prepare setup_discovered_git_dir() for the root directory Currently, the offset parameter (indicating what part of the cwd parameter corresponds to the current directory after discovering the .git/ directory) is set to 0 when we are running in the root directory. However, in the next patches we will avoid changing the current working directory while searching for the .git/ directory, meaning that the offset corresponding to the root directory will have to be 1 to reflect that this directory is characterized by the path "/" (and not ""). So let's make sure that setup_discovered_git_directory() only tries to append the trailing slash to non-root directories. Note: the setup_bare_git_directory() does not need a corresponding change, as it does not want to return a prefix. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/setup.c b/setup.c index 4a15b10567..20a1f0f870 100644 --- a/setup.c +++ b/setup.c @@ -721,8 +721,10 @@ static const char *setup_discovered_git_dir(const char *gitdir, if (offset == cwd->len) return NULL; - /* Make "offset" point to past the '/', and add a '/' at the end */ - offset++; + /* Make "offset" point past the '/' (already the case for root dirs) */ + if (offset != offset_1st_component(cwd->buf)) + offset++; + /* Add a '/' at the end */ strbuf_addch(cwd, '/'); return cwd->buf + offset; }