X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-sh-setup.sh;h=0de49e8459a0d00264de442e6e89db846496541d;hb=a2f8028d3d661b314d5a784764f2f5f9e4c2dde0;hp=87b939c0e4857ec9c9245c01f609a059788f656a;hpb=b11bd57a384a7bee21245d3895d77d20c33e4d78;p=git.git

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 87b939c0e..0de49e845 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -28,6 +28,27 @@ set_reflog_action() {
 	fi
 }
 
+is_bare_repository () {
+	git-rev-parse --is-bare-repository
+}
+
+cd_to_toplevel () {
+	cdup=$(git-rev-parse --show-cdup)
+	if test ! -z "$cdup"
+	then
+		cd "$cdup" || {
+			echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
+			exit 1
+		}
+	fi
+}
+
+require_work_tree () {
+	test $(git-rev-parse --is-inside-work-tree) = true &&
+	test $(git-rev-parse --is-inside-git-dir) = false ||
+	die "fatal: $0 cannot be used without a working tree."
+}
+
 if [ -z "$LONG_USAGE" ]
 then
 	LONG_USAGE="Usage: $0 $USAGE"
@@ -47,7 +68,11 @@ esac
 if [ -z "$SUBDIRECTORY_OK" ]
 then
 	: ${GIT_DIR=.git}
-	GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || exit
+	GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || {
+		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
 fi