[PATCH] setup.c: Improve 'Not a git repository' messages
- From
- Ralf Ebert <ralf@ralfebert.de>
- Date
- Aug 15, 2010, 02:55 UTC
- Message-ID
- <1281840921-1996-1-git-send-email-ralf@ralfebert.de>
- In-Reply-To
- <i43v6e$q00$1@dough.gmane.org>
Changed message "Not a git repository (or any of the parent directories)" to the more precise message "No <.git> repository in <path> or its parent directories".
If a filesystem boundary is encountered with GIT_DISCOVERY_ACROSS_FILESYSTEM not set, the warning now goes first. The warning is suppressed when search was stopped at $HOME to not confuse users using a crypto home volume (assuming that users having a repository at /home or / know what they are doing).
Thanks to Duy, Jonathan, Sverre and Josh for commenting.
Signed-off-by: Ralf Ebert <ralf@ralfebert.de> --- setup.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/setup.c b/setup.c index 2769160..adabdd8 100644 --- a/setup.c +++ b/setup.c @@ -431,7 +431,8 @@ const char *setup_git_directory_gently(int *nongit_ok) *nongit_ok = 1; return NULL; } - die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT); + die("No %s repository in %s or its parent directories", + DEFAULT_GIT_DIR_ENVIRONMENT, cwd); } if (one_filesystem) { if (stat("..", &buf)) { @@ -445,9 +446,14 @@ const char *setup_git_directory_gently(int *nongit_ok) *nongit_ok = 1; return NULL; } - cwd[offset] = '\0'; - die("Not a git repository (or any parent up to mount parent %s)\n" - "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).", cwd); + const char *home = getenv("HOME"); + if (home == NULL || strncmp(home, cwd, offset) != 0) { + warning("Stopped searching for %s at %.*s " + "as GIT_DISCOVERY_ACROSS_FILESYSTEM is not set", + DEFAULT_GIT_DIR_ENVIRONMENT, offset, cwd); + } + die("No %s repository in %s or its parent directories", + DEFAULT_GIT_DIR_ENVIRONMENT, cwd); } } if (chdir("..")) {
-- 1.7.2.1.96.gb740