X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=upload-pack.c;h=95d38120517e31f9c539daeaaec0b75da25f1e82;hb=87a81c834bf48f8cbf8778cae78ed553f3bbd32c;hp=d35c0685ce2269cec48d19fbf6b0499374a34b7e;hpb=f4b3a4c30b5ea3a5de2a2597a3c53266017d02ba;p=git.git diff --git a/upload-pack.c b/upload-pack.c index d35c0685..95d38120 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]; @@ -153,6 +153,7 @@ static int send_ref(const char *refname, const unsigned char *sha1) static int upload_pack(void) { + head_ref(send_ref); for_each_ref(send_ref); packet_flush(1); nr_needs = receive_needs(); @@ -169,8 +170,12 @@ 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);