From 4d6d6d2d3f778b892f2481969e530ff67ee0aa6c Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Mon, 18 Feb 2008 11:44:19 +0100 Subject: [PATCH] Simplify setup of $GIT_DIR in git-sh-setup.sh Using 'git rev-parse --git-dir' makes the code shorter and more future- proof. Signed-off-by: Lars Hjemli Signed-off-by: Junio C Hamano --- git-sh-setup.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index f38827529f..a44b1c74a3 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -127,20 +127,14 @@ get_author_ident_from_commit () { # if we require to be in a git repository. if test -z "$NONGIT_OK" then + GIT_DIR=$(git rev-parse --git-dir) || exit if [ -z "$SUBDIRECTORY_OK" ] then - : ${GIT_DIR=.git} test -z "$(git rev-parse --show-cdup)" || { exit=$? echo >&2 "You need to run this command from the toplevel of the working tree." exit $exit } - else - GIT_DIR=$(git rev-parse --git-dir) || { - exit=$? - echo >&2 "Failed to find a valid git directory." - exit $exit - } fi test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || { echo >&2 "Unable to determine absolute path of git directory" -- 2.11.4.GIT