diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-11 12:39:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-12 04:59:25 -0800 |
| commit | 4890f62bc02929b174ff5fa0e3656ea3d40f0e57 (patch) | |
| tree | e8e7510d265e36ab18297f1970a8044d8735278d | |
| parent | 16139f9035137ccd81e1e9a9dc203fbede6997a0 (diff) | |
| download | git-4890f62bc02929b174ff5fa0e3656ea3d40f0e57.tar.gz git-4890f62bc02929b174ff5fa0e3656ea3d40f0e57.tar.xz | |
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 <junkio@cox.net>
| -rwxr-xr-x | git-pull.sh | 8 | ||||
| -rwxr-xr-x | git-sh-setup.sh | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/git-pull.sh b/git-pull.sh index 0991d5f14..6caf1aad4 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -70,21 +70,21 @@ case "$merge_head" in exit 0 ;; ?*' '?*) - var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'` + var=`git repo-config --get pull.octopus` if test '' = "$var" then strategy_default_args='-s octopus' else - strategy_default_args=$var + strategy_default_args="-s $var" fi ;; *) - var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'` + var=`git repo-config --get pull.twohead` if test '' = "$var" then strategy_default_args='-s recursive' else - strategy_default_args=$var + strategy_default_args="-s $var" fi ;; esac diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 1e638e493..157c7e4d6 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 |