From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Luke Shumaker <lukeshu@lukeshu.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 0/2] Fix git subtree on Windows
Date: Mon, 14 Jun 2021 12:41:51 +0000 [thread overview]
Message-ID: <pull.978.v2.git.1623674513.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.978.git.1623316412.gitgitgadget@gmail.com>
In the topic branch ls/subtree, we saw a lot of improvements of the git
subtree command, and some cleaning up, too. For example, 22d550749361
(subtree: don't fuss with PATH, 2021-04-27) carefully laid out a history of
changes intended to work around issues where the git-subtree script was not
in the intended location, and removed a statement modifying PATH in favor of
a conditional warning (contingent on the PATH being in an unexpected shape).
This particular condition, however, was never tested on Windows, and it
broke git subtree in Git for Windows v2.32.0, as reported here
[https://github.com/git-for-windows/git/issues/3260]. Now, every invocation
of git subtree, with or without command-line arguments, results in output
like this:
It looks like either your git installation or your
git-subtree installation is broken.
Tips:
- If `git --exec-path` does not print the correct path to
your git install directory, then set the GIT_EXEC_PATH
environment variable to the correct directory.
- Make sure that your `git-core\git-subtree` file is either in your
PATH or in your git exec path (`C:/Users/harry/Downloads/PortableGit/mingw64/libexec/git-core`).
- You should run git-subtree as `git core\git-subtree`,
not as `git-core\git-subtree`.
This patch series provides a fix for that symptom, and is based on
ls/subtree.
Changes since v1:
* Instead of using the Windows-specific cygpath construct, we now instead
fall back to verify that GIT_EXEC_PATH and the first component of PATH
refer to the same entity (via the -ef operator, which compares inodes).
Since the bug affects only Windows, as far as we know, the
non-portability of the -ef operator does not matter because Git for
Windows' Bash does have support for it.
Johannes Schindelin (2):
subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
subtree: fix assumption about the directory separator
contrib/subtree/git-subtree.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
base-commit: 9a3e3ca2ba869f9fef9f8be390ed45457565ccd1
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-978%2Fdscho%2Ffix-subtree-on-windows-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-978/dscho/fix-subtree-on-windows-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/978
Range-diff vs v1:
1: a91ac6c18938 ! 1: 5f2d9434b4eb subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
@@ Commit message
`GIT_EXEC_PATH` is a Windows-style path, while `PATH` is a Unix-style
path list.
- Let's keep the original spirit, and hack together something that
- unbreaks the logic on Windows.
+ Let's make extra certain that `$GIT_EXEC_PATH` and the first component
+ of `$PATH` refer to different entities before erroring out.
- A more thorough fix would look at the inode of `$GIT_EXEC_PATH` and of
- the first component of `$PATH`, to make sure that they are identical,
- but that is even trickier to do in a portable way.
+ 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 https://github.com/git-for-windows/git/issues/3260
@@ contrib/subtree/git-subtree.sh
#
-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 "${PATH#"${GIT_EXEC_PATH}:"}" = "$PATH" && {
-+ # On Windows, PATH might be Unix-style, GIT_EXEC_PATH not
-+ ! type -p cygpath >/dev/null 2>&1 ||
-+ test "${PATH#$(cygpath -au "$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
echo >&2 'It looks like either your git installation or your'
echo >&2 'git-subtree installation is broken.'
2: 4e1a569c9fa4 ! 2: a6f7aa40485f subtree: fix assumption about the directory separator
@@ Commit message
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
## contrib/subtree/git-subtree.sh ##
-@@ contrib/subtree/git-subtree.sh: if test -z "$GIT_EXEC_PATH" || {
- }
- } || ! test -f "$GIT_EXEC_PATH/git-sh-setup"
+@@ contrib/subtree/git-subtree.sh: if test -z "$GIT_EXEC_PATH" || ! test -f "$GIT_EXEC_PATH/git-sh-setup" || {
+ test ! "$GIT_EXEC_PATH" -ef "${PATH%%:*}" 2>/dev/null
+ }
then
-+ base=${0##*/}
-+ base=${base##*\\}
++ basename=${0##*[/\\]}
echo >&2 'It looks like either your git installation or your'
echo >&2 'git-subtree installation is broken.'
echo >&2
@@ contrib/subtree/git-subtree.sh: then
echo >&2 " your git install directory, then set the GIT_EXEC_PATH"
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 \`$base\` 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 " - You should run git-subtree as \`git ${0##*/git-}\`,"
- echo >&2 " not as \`${0##*/}\`." >&2
-+ echo >&2 " - You should run git-subtree as \`git ${base#git-}\`,"
-+ echo >&2 " not as \`$base\`." >&2
++ echo >&2 " - You should run git-subtree as \`git ${basename#git-}\`,"
++ echo >&2 " not as \`$basename\`." >&2
exit 126
fi
--
gitgitgadget
next prev parent reply other threads:[~2021-06-14 12:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 9:13 [PATCH 0/2] Fix git subtree on Windows Johannes Schindelin via GitGitGadget
2021-06-10 9:13 ` [PATCH 1/2] subtree: fix the GIT_EXEC_PATH sanity check to work " Johannes Schindelin via GitGitGadget
2021-06-11 0:40 ` Luke Shumaker
2021-06-11 1:37 ` Junio C Hamano
2021-06-11 4:31 ` Luke Shumaker
2021-06-11 10:19 ` Johannes Schindelin
2021-06-11 13:41 ` Luke Shumaker
2021-06-14 11:56 ` Johannes Schindelin
2021-06-15 2:33 ` Junio C Hamano
2021-06-15 10:56 ` Jeff King
2021-06-15 11:05 ` Bagas Sanjaya
2021-06-15 11:18 ` Jeff King
2021-06-15 11:27 ` Johannes Schindelin
2021-06-16 0:52 ` Junio C Hamano
2021-06-16 7:49 ` Jeff King
2021-06-10 9:13 ` [PATCH 2/2] subtree: fix assumption about the directory separator Johannes Schindelin via GitGitGadget
2021-06-11 1:02 ` Luke Shumaker
2021-06-11 10:35 ` Johannes Schindelin
2021-06-11 0:58 ` [PATCH 0/2] Fix git subtree on Windows Luke Shumaker
2021-06-11 10:30 ` Johannes Schindelin
2021-06-11 13:46 ` Luke Shumaker
2021-06-11 15:50 ` Felipe Contreras
2021-06-12 2:58 ` Luke Shumaker
2021-06-14 12:41 ` Johannes Schindelin via GitGitGadget [this message]
2021-06-14 12:41 ` [PATCH v2 1/2] subtree: fix the GIT_EXEC_PATH sanity check to work " Johannes Schindelin via GitGitGadget
2021-06-15 2:37 ` Junio C Hamano
2021-06-14 12:41 ` [PATCH v2 2/2] subtree: fix assumption about the directory separator Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.978.v2.git.1623674513.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=lukeshu@lukeshu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).