Skip to content

Commit 5f2d943

Browse files
committed
subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
In 22d5507 (subtree: don't fuss with PATH, 2021-04-27), `git subtree` was broken thoroughly on Windows. The reason is that it assumes Unix semantics, where `PATH` is colon-separated, and it assumes that `$GIT_EXEC_PATH:` is a verbatim prefix of `$PATH`. Neither are true, the latter in particular because `GIT_EXEC_PATH` is a Windows-style path, while `PATH` is a Unix-style path list. Let's make extra certain that `$GIT_EXEC_PATH` and the first component of `$PATH` refer to different entities before erroring out. We do that by using the `test <path1> -ef <path2>` command that verifies that the inode of `<path1>` and of `<path2>` is the same. Sadly, this construct is non-portable, according to https://pubs.opengroup.org/onlinepubs/009695399/utilities/test.html. However, it does not matter in practice because we still first look whether `$GIT_EXEC_PREFIX` is string-identical to the first component of `$PATH`. This will give us the expected result everywhere but in Git for Windows, and Git for Windows' own Bash _does_ handle the `-ef` operator. Just in case that we _do_ need to show the error message _and_ are running in a shell that lacks support for `-ef`, we simply suppress the error output for that part. This fixes git-for-windows#3260 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 9a3e3ca commit 5f2d943

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

contrib/subtree/git-subtree.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
# Copyright (C) 2009 Avery Pennarun <[email protected]>
66
#
77

8-
if test -z "$GIT_EXEC_PATH" || test "${PATH#"${GIT_EXEC_PATH}:"}" = "$PATH" || ! test -f "$GIT_EXEC_PATH/git-sh-setup"
8+
if test -z "$GIT_EXEC_PATH" || ! test -f "$GIT_EXEC_PATH/git-sh-setup" || {
9+
test "${PATH#"${GIT_EXEC_PATH}:"}" = "$PATH" &&
10+
test ! "$GIT_EXEC_PATH" -ef "${PATH%%:*}" 2>/dev/null
11+
}
912
then
1013
echo >&2 'It looks like either your git installation or your'
1114
echo >&2 'git-subtree installation is broken.'

0 commit comments

Comments
 (0)