From 4890f62bc02929b174ff5fa0e3656ea3d40f0e57 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 11 Feb 2006 12:39:11 -0800 Subject: Avoid using "git-var -l" until it gets fixed. This is to be nicer to people with unusable GECOS field. "git-var -l" is currently broken in that when used by a user who does not have a usable GECOS field and has not corrected it by exporting GIT_COMMITTER_NAME environment variable it dies when it tries to output GIT_COMMITTER_IDENT (same thing for AUTHOR). "git-pull" used "git-var -l" only because it needed to get a configuration variable before "git-repo-config --get" was introduced. Use the latter tool designed exactly for this purpose. "git-sh-setup" used "git-var GIT_AUTHOR_IDENT" without actually wanting to use its value. The only purpose was to cause the command to check and barf if the repository format version recorded in the $GIT_DIR/config file is too new for us to deal with correctly. Instead, use "repo-config --get" on a random property and see if it die()s, and check if the exit status is 128 (comes from die -- missing variable is reported with exit status 1, so we can tell that case apart). Signed-off-by: Junio C Hamano --- git-sh-setup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'git-sh-setup.sh') diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 1e638e493d..157c7e4d6c 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -41,7 +41,11 @@ then : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} # Make sure we are in a valid repository of a vintage we understand. - GIT_DIR="$GIT_DIR" git-var GIT_AUTHOR_IDENT >/dev/null || exit + GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null + if test $? == 128 + then + exit + fi else GIT_DIR=$(git-rev-parse --git-dir) || exit fi -- cgit v1.3