mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sp/sh-windows-pwd'

Browse Source 
* sp/sh-windows-pwd:
  git-sh-setup: define workaround wrappers before they are used
This commit is contained in:
Junio C Hamano
2012-05-25 12:08:26 -07:00
parent 7903e66a3e 10587ce6df
commit 4acf8e85dc
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
git-sh-setup.sh
View File

@ -218,27 +218,8 @@ clear_local_git_env() {
unset $(git rev-parse --local-env-vars) unset $(git rev-parse --local-env-vars)
} }
# Make sure we are in a valid repository of a vintage we understand,
# if we require to be in a git repository.
if test -z "$NONGIT_OK"
then
GIT_DIR=$(git rev-parse --git-dir) || exit
if [ -z "$SUBDIRECTORY_OK" ]
then
test -z "$(git rev-parse --show-cdup)" || {
exit=$?
echo >&2 "You need to run this command from the toplevel of the working tree."
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"}
fi
# Fix some commands on Windows # Platform specific tweaks to work around some commands
case $(uname -s) in case $(uname -s) in
*MINGW*) *MINGW*)
# Windows has its own (incompatible) sort and find # Windows has its own (incompatible) sort and find
@ -269,3 +250,23 @@ case $(uname -s) in
return 1 return 1
} }
esac esac
# Make sure we are in a valid repository of a vintage we understand,
# if we require to be in a git repository.
if test -z "$NONGIT_OK"
then
GIT_DIR=$(git rev-parse --git-dir) || exit
if [ -z "$SUBDIRECTORY_OK" ]
then
test -z "$(git rev-parse --show-cdup)" || {
exit=$?
echo >&2 "You need to run this command from the toplevel of the working tree."
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"}
fi