X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=upload-pack.c;h=da10742c44201cfb6f86eb8d80f3be27940335ff;hb=df8baa42fe4eeb5a021ac262caf601f44d2a5746;hp=6d844cc3199ae5bda475ec57bef4efb4901176bb;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git

diff --git a/upload-pack.c b/upload-pack.c
index 6d844cc3..da10742c 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -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;
 }