X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=upload-pack.c;h=a49d87244706a4faacaadf7916ec86f2e2c0f04e;hb=a4df22ce49d0457f3dbec5083064f9d24e4d17dd;hp=e5adbc011e0ab71eeb06a42c4bd40cbea0bf3fa2;hpb=141201d124f3663a98e0f362c1af7f5f7b58dabb;p=git.git
diff --git a/upload-pack.c b/upload-pack.c
index e5adbc011..a49d87244 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -11,7 +11,7 @@
#include "list-objects.h"
#include "run-command.h"
-static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn]
";
+static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=nn] ";
/* bits #0..7 in revision.h, #8..10 in commit.c */
#define THEY_HAVE (1u << 11)
@@ -397,12 +397,11 @@ static int get_common_commits(void)
static char line[1000];
unsigned char sha1[20];
char hex[41], last_hex[41];
- int len;
save_commit_buffer = 0;
for(;;) {
- len = packet_read_line(0, line, sizeof(line));
+ int len = packet_read_line(0, line, sizeof(line));
reset_timeout();
if (!len) {
@@ -410,7 +409,7 @@ static int get_common_commits(void)
packet_write(1, "NAK\n");
continue;
}
- len = strip(line, len);
+ strip(line, len);
if (!prefixcmp(line, "have ")) {
switch (got_sha1(line+5, sha1)) {
case -1: /* they have what we do not */
@@ -616,6 +615,8 @@ int main(int argc, char **argv)
int i;
int strict = 0;
+ git_extract_argv0_path(argv[0]);
+
for (i = 1; i < argc; i++) {
char *arg = argv[i];
@@ -643,7 +644,7 @@ int main(int argc, char **argv)
dir = argv[i];
if (!enter_repo(dir, strict))
- die("'%s': unable to chdir or not a git archive", dir);
+ die("'%s' does not appear to be a git repository", dir);
if (is_repository_shallow())
die("attempt to fetch/clone from a shallow repository");
if (getenv("GIT_DEBUG_SEND_PACK"))