X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=upload-pack.c;h=3606529f61c50aa1c4d73877ccc4601ef036fcb5;hb=72fdfb50f721460e4cdff16fbe9c72d4ce6c668c;hp=be63132804252e9a2f94ce1166ef9fa319a845fd;hpb=6ddc0964034342519a87fe013781abf31c6db6ad;p=git.git
diff --git a/upload-pack.c b/upload-pack.c
index be631328..3606529f 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -4,6 +4,7 @@
#include "tag.h"
#include "object.h"
#include "commit.h"
+#include "exec_cmd.h"
static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn]
";
@@ -60,7 +61,7 @@ static void create_pack_file(void)
close(0);
close(fd[0]);
close(fd[1]);
- *p++ = "git-rev-list";
+ *p++ = "rev-list";
*p++ = "--objects";
if (create_full_pack || MAX_NEEDS <= nr_needs)
*p++ = "--all";
@@ -79,13 +80,13 @@ static void create_pack_file(void)
buf += 41;
}
*p++ = NULL;
- execvp("git-rev-list", argv);
+ execv_git_cmd(argv);
die("git-upload-pack: unable to exec git-rev-list");
}
dup2(fd[0], 0);
close(fd[0]);
close(fd[1]);
- execlp("git-pack-objects", "git-pack-objects", "--stdout", NULL);
+ execl_git_cmd("pack-objects", "--stdout", NULL);
die("git-upload-pack: unable to exec git-pack-objects");
}
@@ -215,6 +216,9 @@ static int send_ref(const char *refname, const unsigned char *sha1)
static char *capabilities = "multi_ack";
struct object *o = parse_object(sha1);
+ if (!o)
+ die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
+
if (capabilities)
packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
0, capabilities);
@@ -248,7 +252,7 @@ static int upload_pack(void)
int main(int argc, char **argv)
{
- const char *dir;
+ char *dir;
int i;
int strict = 0;
@@ -275,18 +279,9 @@ int main(int argc, char **argv)
usage(upload_pack_usage);
dir = argv[i];
- /* chdir to the directory. If that fails, try appending ".git" */
- if (chdir(dir) < 0) {
- if (strict || chdir(mkpath("%s.git", dir)) < 0)
- die("git-upload-pack unable to chdir to %s", dir);
- }
- if (!strict)
- 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);
+ if (!enter_repo(dir, strict))
+ die("'%s': unable to chdir or not a git archive", dir);
- putenv("GIT_DIR=.");
upload_pack();
return 0;
}