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>

diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c
index 849f1fe6f9c703bd7717e54548300dfe6e495061..a970b39505b5dda0bfa32a1a9c14ad676d28ec92 100644 (file)
--- 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))
        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");
 
        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 a9b02fa32f372a6810867c10560a20d58b5b2a91..0206b416cbf08ae4c1b0d753784fb0b61bac46a1 100644 (file)
--- 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))
        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;
 
        /* put received options in sent_argv[] */
        sent_argc = 1;

diff --git a/daemon.c b/daemon.c
index d93cf960f9eaf05eec11b67746142e6e94d719cb..13401f1baf57dc87a7a95bd778f4e1becbdbe323 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -229,7 +229,7 @@ static char *path_ok(char *directory)
        }
 
        if (!path) {
        }
 
        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;
        }
 
                return NULL;
        }
 

diff --git a/upload-pack.c b/upload-pack.c
index 19c24db643c0bceb6e1b960d411d657d2feb0f32..e15ebdc287e9ed7b91677a2bb8cb13dfc1abe639 100644 (file)
--- 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))
        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"))
        if (is_repository_shallow())
                die("attempt to fetch/clone from a shallow repository");
        if (getenv("GIT_DEBUG_SEND_PACK"))