git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: travis.carden@gmail.com
To: git@vger.kernel.org, gitster@pobox.com, travis.carden@gmail.com
Subject: [PATCH] Improve "Not a git repository" error messages
Date: Fri, 24 Aug 2012 22:33:41 -0500	[thread overview]
Message-ID: <1345865621-6941-1-git-send-email-travis.carden@gmail.com> (raw)

From: Travis Carden <travis.carden@gmail.com>

The former messages changed grammatical subject in the middle.

Signed-off-by: Travis Carden <travis.carden@gmail.com>
---
This is my first attempt at contributing to the Git project.
I'm kind of testing the water with a simple patch to see how
friendly the community is. Thanks!

 setup.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.c b/setup.c
index 9139bee..0cd88e5 100644
--- a/setup.c
+++ b/setup.c
@@ -599,7 +599,7 @@ static const char *setup_bare_git_dir(char *cwd, int offset, int len, int *nongi
 static const char *setup_nongit(const char *cwd, int *nongit_ok)
 {
 	if (!nongit_ok)
-		die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
+		die("Not a git repository (or a descendant of one): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
 	if (chdir(cwd))
 		die_errno("Cannot come back to cwd");
 	*nongit_ok = 1;
@@ -706,7 +706,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
 					return NULL;
 				}
 				cwd[offset] = '\0';
-				die("Not a git repository (or any parent up to mount point %s)\n"
+				die("Not a git repository (or a descendant of one up to mount point %s)\n"
 				"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).", cwd);
 			}
 		}
-- 
1.7.9.5

                 reply	other threads:[~2012-08-25  3:34 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345865621-6941-1-git-send-email-travis.carden@gmail.com \
    --to=travis.carden@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).