threads / patch / 31351

patchImprove "Not a git repository" error messages

Subject: [PATCH] Improve "Not a git repository" error messages

## tl;dr

One message between Aug 25, 2012 and Aug 25, 2012. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

travis.carden@gmail.com· Aug 25, 2012, 03:33 UTC · lore
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(-)
Show changes to setup.c +2 −2
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

← back to recent threads