Merge branch 'np/delta' into next

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 1e638e493d51c9216e3d2e93aad5657cdf9793b4..025ef2d5f6b37d89dab1d602e1d8d1a80ab7f42e 100755 (executable)
--- 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