summaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorDavid Kastrup <dak@gnu.org>2007-08-11 15:36:28 +0200
committerJunio C Hamano <gitster@pobox.com>2007-08-13 21:19:48 -0700
commitb2bc9a30981ace8c18d1a73b3e10153efc5c20f7 (patch)
tree4c8cceb653e27c2b5d089a5f279647ec8b25c5f3 /git-sh-setup.sh
parent0476786e645ae18096d6a63de5fd4b756071b522 (diff)
downloadgit-b2bc9a30981ace8c18d1a73b3e10153efc5c20f7.tar.gz
git-sh-setup.sh: make GIT_DIR absolute
Quite a few of the scripts are rather careless about using GIT_DIR while changing directories. Some try their hands (with different likelihood of success) in making GIT_DIR absolute. This patch lets git-sh-setup.sh cater for absolute directories (in a way that should work reliably also with non-Unix path names) and removes the respective kludges in git-filter-branch.sh and git-instaweb.sh. Signed-off-by: David Kastrup <dak@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-sh-setup.sh')
-rwxr-xr-xgit-sh-setup.sh12
1 files changed, 11 insertions, 1 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 8cbd153b62..185c5c6c95 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -116,6 +116,16 @@ then
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"}