mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'js/subtree-on-windows-fix'
Update "git subtree" to work better on Windows. * js/subtree-on-windows-fix: subtree: fix assumption about the directory separator subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
This commit is contained in:
commit
e22ac8b126
|
@ -5,8 +5,12 @@
|
||||||
# Copyright (C) 2009 Avery Pennarun <apenwarr@gmail.com>
|
# Copyright (C) 2009 Avery Pennarun <apenwarr@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
if test -z "$GIT_EXEC_PATH" || test "${PATH#"${GIT_EXEC_PATH}:"}" = "$PATH" || ! test -f "$GIT_EXEC_PATH/git-sh-setup"
|
if test -z "$GIT_EXEC_PATH" || ! test -f "$GIT_EXEC_PATH/git-sh-setup" || {
|
||||||
|
test "${PATH#"${GIT_EXEC_PATH}:"}" = "$PATH" &&
|
||||||
|
test ! "$GIT_EXEC_PATH" -ef "${PATH%%:*}" 2>/dev/null
|
||||||
|
}
|
||||||
then
|
then
|
||||||
|
basename=${0##*[/\\]}
|
||||||
echo >&2 'It looks like either your git installation or your'
|
echo >&2 'It looks like either your git installation or your'
|
||||||
echo >&2 'git-subtree installation is broken.'
|
echo >&2 'git-subtree installation is broken.'
|
||||||
echo >&2
|
echo >&2
|
||||||
|
@ -14,10 +18,10 @@ then
|
||||||
echo >&2 " - If \`git --exec-path\` does not print the correct path to"
|
echo >&2 " - If \`git --exec-path\` does not print the correct path to"
|
||||||
echo >&2 " your git install directory, then set the GIT_EXEC_PATH"
|
echo >&2 " your git install directory, then set the GIT_EXEC_PATH"
|
||||||
echo >&2 " environment variable to the correct directory."
|
echo >&2 " environment variable to the correct directory."
|
||||||
echo >&2 " - Make sure that your \`${0##*/}\` file is either in your"
|
echo >&2 " - Make sure that your \`$basename\` file is either in your"
|
||||||
echo >&2 " PATH or in your git exec path (\`$(git --exec-path)\`)."
|
echo >&2 " PATH or in your git exec path (\`$(git --exec-path)\`)."
|
||||||
echo >&2 " - You should run git-subtree as \`git ${0##*/git-}\`,"
|
echo >&2 " - You should run git-subtree as \`git ${basename#git-}\`,"
|
||||||
echo >&2 " not as \`${0##*/}\`." >&2
|
echo >&2 " not as \`$basename\`." >&2
|
||||||
exit 126
|
exit 126
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue