mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always show which directory is not a git repository

Browse Source 
Unify all

  fatal: Not a git repository

error messages so they include path information.

Signed-off-by: Richard Hartmann <richih@net.in.tum.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Richard Hartmann
2008-12-22 00:17:32 +01:00
committed by Junio C Hamano
parent 5fdb709835
commit f66bc5f928
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/workdir/git-new-workdir
View File

@ -22,7 +22,7 @@ branch=$3
# want to make sure that what is pointed to has a .git directory ... # want to make sure that what is pointed to has a .git directory ...
git_dir=$(cd "$orig_git" 2>/dev/null && git_dir=$(cd "$orig_git" 2>/dev/null &&
git rev-parse --git-dir 2>/dev/null) || git rev-parse --git-dir 2>/dev/null) ||
die "\"$orig_git\" is not a git repository!" die "Not a git repository: \"$orig_git\""
case "$git_dir" in case "$git_dir" in
.git) .git)

4
perl/Git.pm
View File

@ -204,14 +204,14 @@ sub repository {
unless (-d "$dir/refs" and -d "$dir/objects" and -e "$dir/HEAD") { unless (-d "$dir/refs" and -d "$dir/objects" and -e "$dir/HEAD") {
# Mimick git-rev-parse --git-dir error message: # Mimick git-rev-parse --git-dir error message:
throw Error::Simple('fatal: Not a git repository'); throw Error::Simple("fatal: Not a git repository: $dir");
} }
my $search = Git->repository(Repository => $dir); my $search = Git->repository(Repository => $dir);
try { try {
$search->command('symbolic-ref', 'HEAD'); $search->command('symbolic-ref', 'HEAD');
} catch Git::Error::Command with { } catch Git::Error::Command with {
# Mimick git-rev-parse --git-dir error message: # Mimick git-rev-parse --git-dir error message:
throw Error::Simple('fatal: Not a git repository'); throw Error::Simple("fatal: Not a git repository: $dir");
} }
$opts{Repository} = abs_path($dir); $opts{Repository} = abs_path($dir);

2
setup.c
View File

@ -468,7 +468,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
*nongit_ok = 1; *nongit_ok = 1;
return NULL; return NULL;
} }
die("Not a git repository"); die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
} }
if (chdir("..")) if (chdir(".."))
die("Cannot change to %s/..: %s", cwd, strerror(errno)); die("Cannot change to %s/..: %s", cwd, strerror(errno));