X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-sh-setup.sh;h=3c325fd1339608d681d3485aa37647d9ac734037;hb=9d87442f03c9e3fea7e24e2821fc0342f8efe1d6;hp=98959600ebf5ccc3693d1b3048ebcd59696b64d0;hpb=1fd81efad0d65afba91f8fb27b40a6345bfb50de;p=git.git

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 98959600e..3c325fd13 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -6,7 +6,7 @@
 # it dies.
 
 # Having this variable in your environment would break scripts because
-# you would cause "cd" to be be taken to unexpected places.  If you
+# you would cause "cd" to be taken to unexpected places.  If you
 # like CDPATH, define it for your interactive shell sessions without
 # exporting it.
 unset CDPATH
@@ -28,12 +28,28 @@ set_reflog_action() {
 	fi
 }
 
+git_editor() {
+	: "${GIT_EDITOR:=$(git config core.editor)}"
+	: "${GIT_EDITOR:=${VISUAL:-${EDITOR}}}"
+	case "$GIT_EDITOR,$TERM" in
+	,dumb)
+		echo >&2 "No editor specified in GIT_EDITOR, core.editor, VISUAL,"
+		echo >&2 "or EDITOR. Tried to fall back to vi but terminal is dumb."
+		echo >&2 "Please set one of these variables to an appropriate"
+		echo >&2 "editor or run $0 with options that will not cause an"
+		echo >&2 "editor to be invoked (e.g., -m or -F for git-commit)."
+		exit 1
+		;;
+	esac
+	eval "${GIT_EDITOR:=vi}" '"$@"'
+}
+
 is_bare_repository () {
-	git-rev-parse --is-bare-repository
+	git rev-parse --is-bare-repository
 }
 
 cd_to_toplevel () {
-	cdup=$(git-rev-parse --show-cdup)
+	cdup=$(git rev-parse --show-cdup)
 	if test ! -z "$cdup"
 	then
 		cd "$cdup" || {
@@ -44,8 +60,7 @@ cd_to_toplevel () {
 }
 
 require_work_tree () {
-	test $(git-rev-parse --is-inside-work-tree) = true &&
-	test $(git-rev-parse --is-inside-git-dir) = false ||
+	test $(git rev-parse --is-inside-work-tree) = true ||
 	die "fatal: $0 cannot be used without a working tree."
 }
 
@@ -95,12 +110,22 @@ esac
 if [ -z "$SUBDIRECTORY_OK" ]
 then
 	: ${GIT_DIR=.git}
-	GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || {
+	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
+	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"
+    exit 1
+}
+
 : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}