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

setup.c: detect $GIT_COMMON_DIR in is_git_directory()

Browse Source 
If the file "$GIT_DIR/commondir" exists, it contains the value of
$GIT_COMMON_DIR.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2014-11-30 15:24:41 +07:00 committed by Junio C Hamano
parent 1d186b6f35
commit 4dc4e1457e
2 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/gitrepository-layout.txt
View File

@ -240,6 +240,13 @@ shallow::
file is ignored if $GIT_COMMON_DIR is set and file is ignored if $GIT_COMMON_DIR is set and
"$GIT_COMMON_DIR/shallow" will be used instead. "$GIT_COMMON_DIR/shallow" will be used instead.
commondir::
If this file exists, $GIT_COMMON_DIR (see linkgit:git[1]) will
be set to the path specified in this file if it is not
explicitly set. If the specified path is relative, it is
relative to $GIT_DIR. The repository with commondir is
incomplete without the repository pointed by "commondir".
modules:: modules::
Contains the git-repositories of the submodules. This Contains the git-repositories of the submodules. This
directory is ignored if $GIT_COMMON_DIR is set and directory is ignored if $GIT_COMMON_DIR is set and

43
setup.c
View File

@ -224,6 +224,33 @@ void verify_non_filename(const char *prefix, const char *arg)
"'git <command> [<revision>...] -- [<file>...]'", arg); "'git <command> [<revision>...] -- [<file>...]'", arg);
} }
static void get_common_dir(struct strbuf *sb, const char *gitdir)
{
struct strbuf data = STRBUF_INIT;
struct strbuf path = STRBUF_INIT;
const char *git_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT);
if (git_common_dir) {
strbuf_addstr(sb, git_common_dir);
return;
}
strbuf_addf(&path, "%s/commondir", gitdir);
if (file_exists(path.buf)) {
if (strbuf_read_file(&data, path.buf, 0) <= 0)
die_errno(_("failed to read %s"), path.buf);
while (data.len && (data.buf[data.len - 1] == '\n' ||
data.buf[data.len - 1] == '\r'))
data.len--;
data.buf[data.len] = '\0';
strbuf_reset(&path);
if (!is_absolute_path(data.buf))
strbuf_addf(&path, "%s/", gitdir);
strbuf_addbuf(&path, &data);
strbuf_addstr(sb, real_path(path.buf));
} else
strbuf_addstr(sb, gitdir);
strbuf_release(&data);
strbuf_release(&path);
}
/* /*
* Test if it looks like we're at a git directory. * Test if it looks like we're at a git directory.
@ -242,13 +269,22 @@ int is_git_directory(const char *suspect)
int ret = 0; int ret = 0;
size_t len; size_t len;
strbuf_addstr(&path, suspect); /* Check worktree-related signatures */
strbuf_addf(&path, "%s/HEAD", suspect);
if (validate_headref(path.buf))
goto done;
strbuf_reset(&path);
get_common_dir(&path, suspect);
len = path.len; len = path.len;
/* Check non-worktree-related signatures */
if (getenv(DB_ENVIRONMENT)) { if (getenv(DB_ENVIRONMENT)) {
if (access(getenv(DB_ENVIRONMENT), X_OK)) if (access(getenv(DB_ENVIRONMENT), X_OK))
goto done; goto done;
} }
else { else {
strbuf_setlen(&path, len);
strbuf_addstr(&path, "/objects"); strbuf_addstr(&path, "/objects");
if (access(path.buf, X_OK)) if (access(path.buf, X_OK))
goto done; goto done;
@ -259,11 +295,6 @@ int is_git_directory(const char *suspect)
if (access(path.buf, X_OK)) if (access(path.buf, X_OK))
goto done; goto done;
strbuf_setlen(&path, len);
strbuf_addstr(&path, "/HEAD");
if (validate_headref(path.buf))
goto done;
ret = 1; ret = 1;
done: done:
strbuf_release(&path); strbuf_release(&path);