Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/git-count-objects.sh b/git-count-objects.sh
index d6e9a3221f1f63142d9490e9abdfc5c8ac8d6348..40c58efe0884a2431146bdd3dd12910033e5f182 100755 (executable)
--- a/git-count-objects.sh
+++ b/git-count-objects.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-. git-sh-setup
+GIT_DIR=`git-rev-parse --git-dir` || exit $?
 
 dc </dev/null 2>/dev/null || {
        # This is not a real DC at all -- it just knows how