diff options
| author | Jeff King <peff@peff.net> | 2009-03-04 03:32:29 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-04 20:37:21 -0800 |
| commit | 05ac6b34e2c2adda5cb85dd0bdacb47fe5db953e (patch) | |
| tree | 9c71ec4ed8d1c05c32c67b67e9750dc77f0333b8 | |
| parent | aec0c1bbfb2d42659bb710bd79f8228ac59e1b0c (diff) | |
| download | git-05ac6b34e2c2adda5cb85dd0bdacb47fe5db953e.tar.gz | |
improve missing repository error message
Certain remote commands, when asked to do something in a
particular directory that was not actually a git repository,
would say "unable to chdir or not a git archive". The
"chdir" bit is an unnecessary detail, and the term "git
archive" is much less common these days than "git repository".
So let's switch them all to:
fatal: '%s' does not appear to be a git repository
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-receive-pack.c | 2 | ||||
| -rw-r--r-- | builtin-upload-archive.c | 2 | ||||
| -rw-r--r-- | daemon.c | 2 | ||||
| -rw-r--r-- | upload-pack.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c index 849f1fe6f9..a970b39505 100644 --- a/builtin-receive-pack.c +++ b/builtin-receive-pack.c @@ -675,7 +675,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) setup_path(); if (!enter_repo(dir, 0)) - 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 push into a shallow repository"); diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c index a9b02fa32f..0206b416cb 100644 --- a/builtin-upload-archive.c +++ b/builtin-upload-archive.c @@ -35,7 +35,7 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix) strcpy(buf, argv[1]); /* enter-repo smudges its argument */ if (!enter_repo(buf, 0)) - die("not a git archive"); + die("'%s' does not appear to be a git repository", buf); /* put received options in sent_argv[] */ sent_argc = 1; @@ -229,7 +229,7 @@ static char *path_ok(char *directory) } if (!path) { - logerror("'%s': unable to chdir or not a git archive", dir); + logerror("'%s' does not appear to be a git repository", dir); return NULL; } diff --git a/upload-pack.c b/upload-pack.c index 19c24db643..e15ebdc287 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -645,7 +645,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")) |