X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-sh-setup.sh;h=d15747f1ed8f875a3c1bb7129e50bfbc8d2b033f;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=1e638e493d51c9216e3d2e93aad5657cdf9793b4;hpb=9a26dbd120110ad4e07d3047abc13d615183c8ec;p=git.git diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 1e638e49..d15747f1 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -30,7 +30,7 @@ $LONG_USAGE" fi case "$1" in - --h|--he|--hel|--help) + -h|--h|--he|--hel|--help) echo "$LONG_USAGE" exit esac @@ -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