From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Luke Shumaker <lukeshu@datawire.io>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 0/2] Fix git subtree on Windows
Date: Thu, 10 Jun 2021 09:13:29 +0000 [thread overview]
Message-ID: <pull.978.git.1623316412.gitgitgadget@gmail.com> (raw)
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 band-aid to that symptom, and is based on
ls/subtree.
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 | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
base-commit: 9a3e3ca2ba869f9fef9f8be390ed45457565ccd1
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-978%2Fdscho%2Ffix-subtree-on-windows-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-978/dscho/fix-subtree-on-windows-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/978
--
gitgitgadget
next reply other threads:[~2021-06-10 9:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 9:13 Johannes Schindelin via GitGitGadget [this message]
2021-06-10 9:13 ` [PATCH 1/2] subtree: fix the GIT_EXEC_PATH sanity check to work on Windows 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 ` [PATCH v2 " Johannes Schindelin via GitGitGadget
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.git.1623316412.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=lukeshu@datawire.io \
/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).