summaryrefslogtreecommitdiff
path: root/receive-pack.c
diff options
context:
space:
mode:
authorAndreas Ericsson <exon@op5.se>2005-11-17 19:37:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-20 04:50:38 (GMT)
commit8d6301329156e4eeb0d25d6bce14f6e958314986 (patch)
treeeae612390da4734d861982032e4fb0e9230774af /receive-pack.c
parent0870ca7fabe6f25095431280e480859f7c66e8ab (diff)
downloadgit-8d6301329156e4eeb0d25d6bce14f6e958314986.zip
git-8d6301329156e4eeb0d25d6bce14f6e958314986.tar.gz
git-8d6301329156e4eeb0d25d6bce14f6e958314986.tar.bz2
Server-side support for user-relative paths.
This patch basically just removes the redundant code from {receive,upload}-pack.c in favour of the library code in path.c. Signed-off-by: Andreas Ericsson <ae@op5.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'receive-pack.c')
-rw-r--r--receive-pack.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/receive-pack.c b/receive-pack.c
index 8f157bc..1873506 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -248,11 +248,11 @@ static void unpack(void)
int main(int argc, char **argv)
{
int i;
- const char *dir = NULL;
+ char *dir = NULL;
argv++;
for (i = 1; i < argc; i++) {
- const char *arg = *argv++;
+ char *arg = *argv++;
if (*arg == '-') {
/* Do flag handling here */
@@ -265,18 +265,9 @@ int main(int argc, char **argv)
if (!dir)
usage(receive_pack_usage);
- /* chdir to the directory. If that fails, try appending ".git" */
- if (chdir(dir) < 0) {
- if (chdir(mkpath("%s.git", dir)) < 0)
- die("unable to cd to %s", dir);
- }
-
- /* If we have a ".git" directory, chdir to it */
- chdir(".git");
- putenv("GIT_DIR=.");
+ if(!enter_repo(dir, 0))
+ die("'%s': unable to chdir or not a git archive", dir);
- if (access("objects", X_OK) < 0 || access("refs/heads", X_OK) < 0)
- die("%s doesn't appear to be a git directory", dir);
write_head_info();
/* EOF */