summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-30 19:09:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-30 19:09:33 (GMT)
commit9cac9d368934f68e75810df95211a6522d4d139e (patch)
tree6587296cef3998501dd38886d20e80cfd84342ff /setup.c
parent5401f3040b61e11da79d676e42aacfa9f1131083 (diff)
parent99e01692063cc48adee19e1f738472a579c14ca2 (diff)
downloadgit-9cac9d368934f68e75810df95211a6522d4d139e.zip
git-9cac9d368934f68e75810df95211a6522d4d139e.tar.gz
git-9cac9d368934f68e75810df95211a6522d4d139e.tar.bz2
Merge branch 'jc/subdir'
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c28
1 files changed, 25 insertions, 3 deletions
diff --git a/setup.c b/setup.c
index 3286a56..d3556ed 100644
--- a/setup.c
+++ b/setup.c
@@ -47,6 +47,21 @@ const char *prefix_path(const char *prefix, int len, const char *path)
return path;
}
+/*
+ * 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;
+}
+
const char **get_pathspec(const char *prefix, const char **pathspec)
{
const char *entry = *pathspec;
@@ -92,7 +107,7 @@ static int is_toplevel_directory(void)
return 1;
}
-static const char *setup_git_directory_1(void)
+const char *setup_git_directory_gently(int *nongit_ok)
{
static char cwd[PATH_MAX+1];
int len, offset;
@@ -139,8 +154,15 @@ static const char *setup_git_directory_1(void)
break;
chdir("..");
do {
- if (!offset)
+ if (!offset) {
+ if (nongit_ok) {
+ if (chdir(cwd))
+ die("Cannot come back to cwd");
+ *nongit_ok = 1;
+ return NULL;
+ }
die("Not a git repository");
+ }
} while (cwd[--offset] != '/');
}
@@ -172,7 +194,7 @@ int check_repository_format(void)
const char *setup_git_directory(void)
{
- const char *retval = setup_git_directory_1();
+ const char *retval = setup_git_directory_gently(NULL);
check_repository_format();
return retval;
}