X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=upload-pack.c;h=da10742c44201cfb6f86eb8d80f3be27940335ff;hb=a2775c2a410be4bec1e29ae78bccd3247829e2be;hp=9edbf51dc5aac854943ad34c001b11850000e2a7;hpb=723c31fea2f1c4994de837bda9022ffa8b6de1bb;p=git.git diff --git a/upload-pack.c b/upload-pack.c index 9edbf51d..da10742c 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -5,7 +5,7 @@ static const char upload_pack_usage[] = "git-upload-pack "; #define MAX_HAS (16) -#define MAX_NEEDS (16) +#define MAX_NEEDS (256) static int nr_has = 0, nr_needs = 0; static unsigned char has_sha1[MAX_HAS][20]; static unsigned char needs_sha1[MAX_NEEDS][20]; @@ -170,12 +170,16 @@ int main(int argc, char **argv) if (argc != 2) usage(upload_pack_usage); dir = argv[1]; - if (chdir(dir)) - die("git-upload-pack unable to chdir to %s", dir); + + /* chdir to the directory. If that fails, try appending ".git" */ + if (chdir(dir) < 0) { + if (chdir(mkpath("%s.git", dir)) < 0) + die("git-upload-pack unable to chdir to %s", dir); + } 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); - setenv("GIT_DIR", ".", 1); + putenv("GIT_DIR=."); upload_pack(); return 0; }