2005-08-17 05:06:34 +04:00
|
|
|
#include "cache.h"
|
|
|
|
|
2005-09-21 11:00:47 +04:00
|
|
|
const char *prefix_path(const char *prefix, int len, const char *path)
|
2005-08-17 07:44:32 +04:00
|
|
|
{
|
2005-09-21 11:00:47 +04:00
|
|
|
const char *orig = path;
|
2005-08-17 07:44:32 +04:00
|
|
|
for (;;) {
|
|
|
|
char c;
|
|
|
|
if (*path != '.')
|
|
|
|
break;
|
|
|
|
c = path[1];
|
|
|
|
/* "." */
|
|
|
|
if (!c) {
|
|
|
|
path++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* "./" */
|
|
|
|
if (c == '/') {
|
|
|
|
path += 2;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (c != '.')
|
|
|
|
break;
|
|
|
|
c = path[2];
|
|
|
|
if (!c)
|
|
|
|
path += 2;
|
|
|
|
else if (c == '/')
|
|
|
|
path += 3;
|
|
|
|
else
|
|
|
|
break;
|
|
|
|
/* ".." and "../" */
|
|
|
|
/* Remove last component of the prefix */
|
|
|
|
do {
|
|
|
|
if (!len)
|
|
|
|
die("'%s' is outside repository", orig);
|
|
|
|
len--;
|
|
|
|
} while (len && prefix[len-1] != '/');
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (len) {
|
|
|
|
int speclen = strlen(path);
|
|
|
|
char *n = xmalloc(speclen + len + 1);
|
|
|
|
|
|
|
|
memcpy(n, prefix, len);
|
|
|
|
memcpy(n + len, path, speclen+1);
|
|
|
|
path = n;
|
|
|
|
}
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
2005-11-26 10:14:15 +03:00
|
|
|
/*
|
|
|
|
* Unlike prefix_path, this should be used if the named file does
|
|
|
|
* not have to interact with index entry; i.e. name of a random file
|
|
|
|
* on the filesystem.
|
|
|
|
*/
|
|
|
|
const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
|
|
|
|
{
|
|
|
|
static char path[PATH_MAX];
|
|
|
|
if (!pfx || !*pfx || arg[0] == '/')
|
|
|
|
return arg;
|
|
|
|
memcpy(path, pfx, pfx_len);
|
|
|
|
strcpy(path + pfx_len, arg);
|
|
|
|
return path;
|
|
|
|
}
|
|
|
|
|
2006-04-26 21:15:54 +04:00
|
|
|
/*
|
|
|
|
* Verify a filename that we got as an argument for a pathspec
|
|
|
|
* entry. Note that a filename that begins with "-" never verifies
|
|
|
|
* as true, because even if such a filename were to exist, we want
|
|
|
|
* it to be preceded by the "--" marker (or we want the user to
|
|
|
|
* use a format like "./-filename")
|
|
|
|
*/
|
|
|
|
void verify_filename(const char *prefix, const char *arg)
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (*arg == '-')
|
|
|
|
die("bad flag '%s' used after filename", arg);
|
|
|
|
name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
|
|
|
|
if (!lstat(name, &st))
|
|
|
|
return;
|
|
|
|
if (errno == ENOENT)
|
2006-04-27 02:09:27 +04:00
|
|
|
die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
|
|
|
|
"Use '--' to separate paths from revisions", arg);
|
2006-04-26 21:15:54 +04:00
|
|
|
die("'%s': %s", arg, strerror(errno));
|
|
|
|
}
|
|
|
|
|
2006-04-27 02:09:27 +04:00
|
|
|
/*
|
|
|
|
* Opposite of the above: the command line did not have -- marker
|
|
|
|
* and we parsed the arg as a refname. It should not be interpretable
|
|
|
|
* as a filename.
|
|
|
|
*/
|
|
|
|
void verify_non_filename(const char *prefix, const char *arg)
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (*arg == '-')
|
|
|
|
return; /* flag */
|
|
|
|
name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
|
|
|
|
if (!lstat(name, &st))
|
|
|
|
die("ambiguous argument '%s': both revision and filename\n"
|
|
|
|
"Use '--' to separate filenames from revisions", arg);
|
|
|
|
if (errno != ENOENT)
|
|
|
|
die("'%s': %s", arg, strerror(errno));
|
|
|
|
}
|
|
|
|
|
2005-09-21 11:00:47 +04:00
|
|
|
const char **get_pathspec(const char *prefix, const char **pathspec)
|
2005-08-17 05:06:34 +04:00
|
|
|
{
|
2005-09-21 11:00:47 +04:00
|
|
|
const char *entry = *pathspec;
|
|
|
|
const char **p;
|
2005-08-17 05:06:34 +04:00
|
|
|
int prefixlen;
|
|
|
|
|
2005-08-17 07:44:32 +04:00
|
|
|
if (!prefix && !entry)
|
|
|
|
return NULL;
|
2005-08-17 05:06:34 +04:00
|
|
|
|
|
|
|
if (!entry) {
|
|
|
|
static const char *spec[2];
|
|
|
|
spec[0] = prefix;
|
|
|
|
spec[1] = NULL;
|
|
|
|
return spec;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Otherwise we have to re-write the entries.. */
|
|
|
|
p = pathspec;
|
2005-08-17 07:44:32 +04:00
|
|
|
prefixlen = prefix ? strlen(prefix) : 0;
|
2005-08-17 05:06:34 +04:00
|
|
|
do {
|
2005-08-17 07:44:32 +04:00
|
|
|
*p = prefix_path(prefix, prefixlen, entry);
|
2005-08-17 05:06:34 +04:00
|
|
|
} while ((entry = *++p) != NULL);
|
|
|
|
return (const char **) pathspec;
|
|
|
|
}
|
|
|
|
|
[PATCH] Make .git directory validation code test HEAD
Inspired by a report by Kalle Valo, this changes git-sh-setup-script and
the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a
symlink, since a number of core git features depend on that these days.
We used to allow a regular file there, but git-fsck-cache has been
complaining about that for a while, and anything that uses branches
depends on the HEAD file being a symlink, so let's just encode that as a
fundamental requirement.
Before, a non-symlink HEAD file would appear to work, but have subtle bugs
like not having the HEAD show up as a valid reference (because it wasn't
under "refs"). Now, we will complain loudly, and the user can fix it up
trivially instead of getting strange behaviour.
This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY"
being directories, since the other tests will implicitly test for that
anyway (ie the tests for HEAD, refs and 00 would fail).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28 00:54:42 +04:00
|
|
|
/*
|
2006-12-31 07:30:19 +03:00
|
|
|
* Test if it looks like we're at a git directory.
|
2005-11-26 02:43:41 +03:00
|
|
|
* We want to see:
|
[PATCH] Make .git directory validation code test HEAD
Inspired by a report by Kalle Valo, this changes git-sh-setup-script and
the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a
symlink, since a number of core git features depend on that these days.
We used to allow a regular file there, but git-fsck-cache has been
complaining about that for a while, and anything that uses branches
depends on the HEAD file being a symlink, so let's just encode that as a
fundamental requirement.
Before, a non-symlink HEAD file would appear to work, but have subtle bugs
like not having the HEAD show up as a valid reference (because it wasn't
under "refs"). Now, we will complain loudly, and the user can fix it up
trivially instead of getting strange behaviour.
This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY"
being directories, since the other tests will implicitly test for that
anyway (ie the tests for HEAD, refs and 00 would fail).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28 00:54:42 +04:00
|
|
|
*
|
2006-12-31 07:30:19 +03:00
|
|
|
* - either a objects/ directory _or_ the proper
|
[PATCH] Make .git directory validation code test HEAD
Inspired by a report by Kalle Valo, this changes git-sh-setup-script and
the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a
symlink, since a number of core git features depend on that these days.
We used to allow a regular file there, but git-fsck-cache has been
complaining about that for a while, and anything that uses branches
depends on the HEAD file being a symlink, so let's just encode that as a
fundamental requirement.
Before, a non-symlink HEAD file would appear to work, but have subtle bugs
like not having the HEAD show up as a valid reference (because it wasn't
under "refs"). Now, we will complain loudly, and the user can fix it up
trivially instead of getting strange behaviour.
This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY"
being directories, since the other tests will implicitly test for that
anyway (ie the tests for HEAD, refs and 00 would fail).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28 00:54:42 +04:00
|
|
|
* GIT_OBJECT_DIRECTORY environment variable
|
2006-12-31 07:30:19 +03:00
|
|
|
* - a refs/ directory
|
2005-10-01 01:26:57 +04:00
|
|
|
* - either a HEAD symlink or a HEAD file that is formatted as
|
|
|
|
* a proper "ref:".
|
[PATCH] Make .git directory validation code test HEAD
Inspired by a report by Kalle Valo, this changes git-sh-setup-script and
the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a
symlink, since a number of core git features depend on that these days.
We used to allow a regular file there, but git-fsck-cache has been
complaining about that for a while, and anything that uses branches
depends on the HEAD file being a symlink, so let's just encode that as a
fundamental requirement.
Before, a non-symlink HEAD file would appear to work, but have subtle bugs
like not having the HEAD show up as a valid reference (because it wasn't
under "refs"). Now, we will complain loudly, and the user can fix it up
trivially instead of getting strange behaviour.
This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY"
being directories, since the other tests will implicitly test for that
anyway (ie the tests for HEAD, refs and 00 would fail).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28 00:54:42 +04:00
|
|
|
*/
|
2006-12-31 07:30:19 +03:00
|
|
|
static int is_git_directory(const char *suspect)
|
[PATCH] Make .git directory validation code test HEAD
Inspired by a report by Kalle Valo, this changes git-sh-setup-script and
the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a
symlink, since a number of core git features depend on that these days.
We used to allow a regular file there, but git-fsck-cache has been
complaining about that for a while, and anything that uses branches
depends on the HEAD file being a symlink, so let's just encode that as a
fundamental requirement.
Before, a non-symlink HEAD file would appear to work, but have subtle bugs
like not having the HEAD show up as a valid reference (because it wasn't
under "refs"). Now, we will complain loudly, and the user can fix it up
trivially instead of getting strange behaviour.
This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY"
being directories, since the other tests will implicitly test for that
anyway (ie the tests for HEAD, refs and 00 would fail).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28 00:54:42 +04:00
|
|
|
{
|
2006-12-31 07:30:19 +03:00
|
|
|
char path[PATH_MAX];
|
|
|
|
size_t len = strlen(suspect);
|
|
|
|
|
|
|
|
strcpy(path, suspect);
|
|
|
|
if (getenv(DB_ENVIRONMENT)) {
|
|
|
|
if (access(getenv(DB_ENVIRONMENT), X_OK))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
strcpy(path + len, "/objects");
|
|
|
|
if (access(path, X_OK))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
strcpy(path + len, "/refs");
|
|
|
|
if (access(path, X_OK))
|
2005-10-01 01:26:57 +04:00
|
|
|
return 0;
|
2006-12-31 07:30:19 +03:00
|
|
|
|
|
|
|
strcpy(path + len, "/HEAD");
|
|
|
|
if (validate_symref(path))
|
|
|
|
return 0;
|
|
|
|
|
2005-10-01 01:26:57 +04:00
|
|
|
return 1;
|
[PATCH] Make .git directory validation code test HEAD
Inspired by a report by Kalle Valo, this changes git-sh-setup-script and
the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a
symlink, since a number of core git features depend on that these days.
We used to allow a regular file there, but git-fsck-cache has been
complaining about that for a while, and anything that uses branches
depends on the HEAD file being a symlink, so let's just encode that as a
fundamental requirement.
Before, a non-symlink HEAD file would appear to work, but have subtle bugs
like not having the HEAD show up as a valid reference (because it wasn't
under "refs"). Now, we will complain loudly, and the user can fix it up
trivially instead of getting strange behaviour.
This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY"
being directories, since the other tests will implicitly test for that
anyway (ie the tests for HEAD, refs and 00 would fail).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28 00:54:42 +04:00
|
|
|
}
|
|
|
|
|
2005-11-26 10:14:15 +03:00
|
|
|
const char *setup_git_directory_gently(int *nongit_ok)
|
2005-08-17 05:06:34 +04:00
|
|
|
{
|
|
|
|
static char cwd[PATH_MAX+1];
|
2006-12-31 07:30:19 +03:00
|
|
|
const char *gitdirenv;
|
2005-08-17 05:06:34 +04:00
|
|
|
int len, offset;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If GIT_DIR is set explicitly, we're not going
|
2005-11-26 02:43:41 +03:00
|
|
|
* to do any discovery, but we still do repository
|
|
|
|
* validation.
|
2005-08-17 05:06:34 +04:00
|
|
|
*/
|
2006-12-31 07:30:19 +03:00
|
|
|
gitdirenv = getenv(GIT_DIR_ENVIRONMENT);
|
|
|
|
if (gitdirenv) {
|
|
|
|
if (PATH_MAX - 40 < strlen(gitdirenv))
|
2005-11-26 02:43:41 +03:00
|
|
|
die("'$%s' too big", GIT_DIR_ENVIRONMENT);
|
2006-12-31 07:30:19 +03:00
|
|
|
if (is_git_directory(gitdirenv))
|
|
|
|
return NULL;
|
2006-08-04 19:46:19 +04:00
|
|
|
if (nongit_ok) {
|
2006-07-30 05:30:29 +04:00
|
|
|
*nongit_ok = 1;
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-12-31 07:30:19 +03:00
|
|
|
die("Not a git repository: '%s'", gitdirenv);
|
2005-11-26 02:43:41 +03:00
|
|
|
}
|
2005-08-17 05:06:34 +04:00
|
|
|
|
|
|
|
if (!getcwd(cwd, sizeof(cwd)) || cwd[0] != '/')
|
|
|
|
die("Unable to read current working directory");
|
|
|
|
|
|
|
|
offset = len = strlen(cwd);
|
|
|
|
for (;;) {
|
2006-12-31 07:30:19 +03:00
|
|
|
if (is_git_directory(".git"))
|
[PATCH] Make .git directory validation code test HEAD
Inspired by a report by Kalle Valo, this changes git-sh-setup-script and
the "setup_git_directory()" function to test that $GIT_DIR/HEAD is a
symlink, since a number of core git features depend on that these days.
We used to allow a regular file there, but git-fsck-cache has been
complaining about that for a while, and anything that uses branches
depends on the HEAD file being a symlink, so let's just encode that as a
fundamental requirement.
Before, a non-symlink HEAD file would appear to work, but have subtle bugs
like not having the HEAD show up as a valid reference (because it wasn't
under "refs"). Now, we will complain loudly, and the user can fix it up
trivially instead of getting strange behaviour.
This also removes the tests for "$GIT_DIR" and "$GIT_OBJECT_DIRECTORY"
being directories, since the other tests will implicitly test for that
anyway (ie the tests for HEAD, refs and 00 would fail).
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-28 00:54:42 +04:00
|
|
|
break;
|
2005-08-17 05:06:34 +04:00
|
|
|
chdir("..");
|
|
|
|
do {
|
2005-11-26 10:14:15 +03:00
|
|
|
if (!offset) {
|
2006-12-31 07:30:19 +03:00
|
|
|
if (is_git_directory(cwd)) {
|
|
|
|
if (chdir(cwd))
|
|
|
|
die("Cannot come back to cwd");
|
|
|
|
setenv(GIT_DIR_ENVIRONMENT, cwd, 1);
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-11-26 10:14:15 +03:00
|
|
|
if (nongit_ok) {
|
|
|
|
if (chdir(cwd))
|
|
|
|
die("Cannot come back to cwd");
|
|
|
|
*nongit_ok = 1;
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-08-17 05:06:34 +04:00
|
|
|
die("Not a git repository");
|
2005-11-26 10:14:15 +03:00
|
|
|
}
|
2005-08-17 05:06:34 +04:00
|
|
|
} while (cwd[--offset] != '/');
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset == len)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Make "offset" point to past the '/', and add a '/' at the end */
|
|
|
|
offset++;
|
|
|
|
cwd[len++] = '/';
|
|
|
|
cwd[len] = 0;
|
|
|
|
return cwd + offset;
|
|
|
|
}
|
2005-11-26 02:43:41 +03:00
|
|
|
|
2006-06-10 10:09:49 +04:00
|
|
|
int git_config_perm(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
if (value) {
|
|
|
|
if (!strcmp(value, "umask"))
|
|
|
|
return PERM_UMASK;
|
|
|
|
if (!strcmp(value, "group"))
|
|
|
|
return PERM_GROUP;
|
|
|
|
if (!strcmp(value, "all") ||
|
|
|
|
!strcmp(value, "world") ||
|
|
|
|
!strcmp(value, "everybody"))
|
|
|
|
return PERM_EVERYBODY;
|
|
|
|
}
|
|
|
|
return git_config_bool(var, value);
|
|
|
|
}
|
|
|
|
|
2005-11-26 02:59:09 +03:00
|
|
|
int check_repository_format_version(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
if (strcmp(var, "core.repositoryformatversion") == 0)
|
|
|
|
repository_format_version = git_config_int(var, value);
|
2005-12-23 01:13:56 +03:00
|
|
|
else if (strcmp(var, "core.sharedrepository") == 0)
|
2006-06-10 10:09:49 +04:00
|
|
|
shared_repository = git_config_perm(var, value);
|
2005-11-26 02:59:09 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int check_repository_format(void)
|
|
|
|
{
|
|
|
|
git_config(check_repository_format_version);
|
|
|
|
if (GIT_REPO_VERSION < repository_format_version)
|
|
|
|
die ("Expected git repo version <= %d, found %d",
|
|
|
|
GIT_REPO_VERSION, repository_format_version);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-11-26 02:43:41 +03:00
|
|
|
const char *setup_git_directory(void)
|
|
|
|
{
|
2005-11-26 10:14:15 +03:00
|
|
|
const char *retval = setup_git_directory_gently(NULL);
|
2005-11-26 03:08:48 +03:00
|
|
|
check_repository_format();
|
2005-11-26 02:43:41 +03:00
|
|
|
return retval;
|
|
|
|
}
|