diff options
| author | Andreas Ericsson <exon@op5.se> | 2005-11-17 19:37:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-20 04:50:38 (GMT) |
| commit | 8d6301329156e4eeb0d25d6bce14f6e958314986 (patch) | |
| tree | eae612390da4734d861982032e4fb0e9230774af /upload-pack.c | |
| parent | 0870ca7fabe6f25095431280e480859f7c66e8ab (diff) | |
| download | git-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 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/upload-pack.c b/upload-pack.c index be63132..1834b6b 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -248,7 +248,7 @@ static int upload_pack(void) int main(int argc, char **argv) { - const char *dir; + char *dir; int i; int strict = 0; @@ -275,18 +275,9 @@ int main(int argc, char **argv) usage(upload_pack_usage); dir = argv[i]; - /* chdir to the directory. If that fails, try appending ".git" */ - if (chdir(dir) < 0) { - if (strict || chdir(mkpath("%s.git", dir)) < 0) - die("git-upload-pack unable to chdir to %s", dir); - } - if (!strict) - chdir(".git"); - - if (access("objects", X_OK) || access("refs", X_OK)) - die("git-upload-pack: %s doesn't seem to be a git archive", dir); + if (!enter_repo(dir, strict)) + die("'%s': unable to chdir or not a git archive", dir); - putenv("GIT_DIR=."); upload_pack(); return 0; } |