diff options
author | Junio C Hamano <junkio@cox.net> | 2005-11-25 16:35:20 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-11-25 16:35:20 -0800 |
commit | 93dcab2937624ebb97f91807576cddb242a55a46 (patch) | |
tree | 8d16464f16866a7f215401a95f8bdaa124799d49 /receive-pack.c | |
parent | 52b6536c624b4998b3730b55b9bc3d7c4e1071a4 (diff) | |
parent | 2a1ddc58e4d2220feea7eba4623dac07a0f83f94 (diff) | |
download | git-93dcab2937624ebb97f91807576cddb242a55a46.tar.gz |
GIT 0.99.9kv0.99.9k
This is not 1.0rc4 yet, but to push the recent fixes out.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'receive-pack.c')
-rw-r--r-- | receive-pack.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/receive-pack.c b/receive-pack.c index 8f157bc3f0..1873506120 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 */ |