Make "upload-pack" match git-fetch-pack usage

Do the default "try xyz.git xyz fails" thing for the directory we get passed in.
git-mirror · Jul 8, 2005 · 113b947 · 113b947
1 parent 26c8a53
commit 113b947
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/receive-pack.c b/receive-pack.c
@@ -197,9 +197,7 @@ int main(int argc, char **argv)
 
 	/* chdir to the directory. If that fails, try appending ".git" */
 	if (chdir(dir) < 0) {
-		static char path[PATH_MAX];
-		snprintf(path, sizeof(path), "%s.git", dir);
-		if (chdir(path) < 0)
+		if (chdir(mkpath("%s.git", dir)) < 0)
 			die("unable to cd to %s", dir);
 	}
 

diff --git a/upload-pack.c b/upload-pack.c
@@ -170,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);