summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 23:22:22 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-08 23:22:22 (GMT)
commit113b94751d7f10617e22de0d017033a52b224c68 (patch)
treedf72183f1ad2b747764051f7924d4bda9c170534
parent26c8a533afac9540e46e7d7707d9179772c6d2c8 (diff)
downloadgit-113b94751d7f10617e22de0d017033a52b224c68.zip
git-113b94751d7f10617e22de0d017033a52b224c68.tar.gz
git-113b94751d7f10617e22de0d017033a52b224c68.tar.bz2
Make "upload-pack" match git-fetch-pack usage
Do the default "try xyz.git xyz fails" thing for the directory we get passed in.
-rw-r--r--receive-pack.c4
-rw-r--r--upload-pack.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/receive-pack.c b/receive-pack.c
index 1768c87..f39703f 100644
--- 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
index 6d844cc..95d3812 100644
--- 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);