Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix subtree on Windows #3264

Merged
merged 2 commits into from
Jul 5, 2021
Merged

Fix subtree on Windows #3264

merged 2 commits into from
Jul 5, 2021

Conversation

dscho
Copy link
Member

@dscho dscho commented Jun 9, 2021

This fixes #3260.

@dscho dscho mentioned this pull request Jun 9, 2021
Closed
1 task
@dscho dscho requested a review from rimrul June 9, 2021 19:53
@dscho
Copy link
Member Author

dscho commented Jun 10, 2021

GitGitGadget companion: gitgitgadget#978.

@dscho
subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
5f2d943 
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 <johannes.schindelin@gmx.de>
@dscho
subtree: fix assumption about the directory separator
a6f7aa4 
On Windows, both forward and backslash are valid separators. In
22d5507 (subtree: don't fuss with PATH, 2021-04-27), however, we
added code that assumes that it can only be the forward slash.

Let's fix that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho
Copy link
Member Author

dscho commented Jul 5, 2021

This topic has finally advanced to upstream's next branch.

@dscho dscho merged commit ef510a3 into git-for-windows:main Jul 5, 2021
@dscho dscho added this to the Next release milestone Jul 5, 2021
git-for-windows-ci pushed a commit that referenced this pull request Jul 5, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
1d77947 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 5, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
b5e2b8d 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 5, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
21a74fe 
Fix subtree on Windows
dscho added a commit that referenced this pull request Jul 5, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
7d98916 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 6, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
7e10eae 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 6, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
da9c716 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 6, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
54b4534 
Fix subtree on Windows
@dscho dscho deleted the fix-subtree-on-windows branch July 9, 2021 04:34
dscho added a commit that referenced this pull request Jul 10, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
bdb23c0 
Fix subtree on Windows
dscho added a commit that referenced this pull request Jul 10, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
ca3ace2 
Fix subtree on Windows
dscho added a commit that referenced this pull request Jul 14, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
6f0b862 
Fix subtree on Windows
dscho added a commit that referenced this pull request Jul 14, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
36084bb 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 15, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
bfa05f7 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 15, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
819de84 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 19, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
410792d 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 19, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
c74b004 
Fix subtree on Windows
dscho added a commit that referenced this pull request Jul 19, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
4dd167e 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 21, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
6e985f7 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 22, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
bc59172 
Fix subtree on Windows
dscho added a commit that referenced this pull request Jul 23, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
f14fa93 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 24, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
ac2f42b 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 24, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
cb98bec 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 24, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
8f0575e 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 26, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
314225d 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 28, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
36a4dd2 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 28, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
1d6c9d3 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 29, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
cfa1ef6 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 29, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
5e799c4 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Jul 29, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
db63e2f 
Fix subtree on Windows
dscho added a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
e455cd8 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
61139ea 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
8ea39a0 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
ebb9ee3 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
89914ad 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Aug 2, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
0d6d4fc 
Fix subtree on Windows
dscho added a commit that referenced this pull request Aug 3, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
a3684cc 
Fix subtree on Windows
dscho added a commit that referenced this pull request Aug 11, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
7965e41 
Fix subtree on Windows
dscho added a commit that referenced this pull request Aug 13, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
a85a922 
Fix subtree on Windows
dscho added a commit that referenced this pull request Aug 18, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
a0ad531 
Fix subtree on Windows
dscho added a commit that referenced this pull request Aug 23, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
9062de3 
Fix subtree on Windows
git-for-windows-ci pushed a commit that referenced this pull request Aug 24, 2021
@dscho
Merge pull request #3264 from dscho/fix-subtree-on-windows
3642b56 
Fix subtree on Windows
@r-ryabyy
Copy link

r-ryabyy commented Aug 17, 2022 •
edited
Loading

I still have issues on Windows

$ git --version
git version 2.37.2.windows.2

I'm using a bash (git bash) and there are multiple cases where the issue reproduces.

Case 1
System PATH contains "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
user PATH doesn't contain "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
GIT_EXEC_PATH is not exist.

a) from bash terminal command "git subtree" results correctly
b) when i run shell.exec('git subtree') from npm task end up with:

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-subtree file is either in your
    PATH or in your git exec path (C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;).
  • You should run git-subtree as git subtree,
    not as git-subtree.

Case 2
System PATH doesn't contain "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
user PATH doesn't contain "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
GIT_EXEC_PATH is not exist.

a) from bash terminal command "git subtree" results correctly
b) when i run shell.exec('git subtree') from npm task end up with:

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-subtree file is either in your
    PATH or in your git exec path (C:/Program Files/Git/mingw64/libexec/git-core).
  • You should run git-subtree as git subtree,
    not as git-subtree.

Case 3
System PATH doesn't contain "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
user PATH contains "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
GIT_EXEC_PATH is not exist.

a) from bash terminal command "git subtree" results correctly
b) when i run shell.exec('git subtree') from npm task end up with:

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-subtree file is either in your
    PATH or in your git exec path (C:/Program Files/Git/mingw64/libexec/git-core).
  • You should run git-subtree as git subtree,
    not as git-subtree.

Case 4
System PATH doesn't contain "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
user PATH doesn't contain "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
GIT_EXEC_PATH contains "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"

a) from bash terminal command "git subtree" end up with:

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-subtree file is either in your
    PATH or in your git exec path (C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;).
  • You should run git-subtree as git subtree,
    not as git-subtree.

b) when i run shell.exec('git subtree') from npm task end up with:

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-subtree file is either in your
    PATH or in your git exec path (C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;).
  • You should run git-subtree as git subtree,
    not as git-subtree.

Case 5
System PATH doesn't contain "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
user PATH contains "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"
GIT_EXEC_PATH contains "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"

a) from bash terminal command "git subtree" end up with:

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-subtree file is either in your
    PATH or in your git exec path (C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;).
  • You should run git-subtree as git subtree,
    not as git-subtree.

b) when i run shell.exec('git subtree') from npm task end up with:

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-subtree file is either in your
    PATH or in your git exec path (C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;).
  • You should run git-subtree as git subtree,
    not as git-subtree.

And the cherry on the pie - almost in all use cases Windows Powershell executes all commands correctly (both in shell and inside npm task)

Any thoughts ?

@dscho
Copy link
Member Author

dscho commented Aug 18, 2022

b) when i run shell.exec('git subtree') from npm task end up with:

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-subtree file is either in your
    PATH or in your git exec path (C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;).
  • You should run git-subtree as git subtree,
    not as git-subtree.

That error message comes from here.

If I were you, I would edit C:\Program Files\Git\mingw64\libexec\git-core\git-subtree and insert a set -x after the first line, and potentially also echo "$GIT_EXEC_PATH" and similar debug print statements, then try to run it again to diagnose this further, then iterate on that until I know what exactly is going wrong.

@dscho
Copy link
Member Author

dscho commented Aug 18, 2022

System PATH contains "C:\Program Files\Git\usr\bin;C:\Program Files\Git\mingw64\libexec\git-core;"

Please note that it is recommended to add C:\Program Files\Git\cmd and no other directory from within C:\Program Files\Git, as the exact names and locations of those files are implementation details and hence subject to change. The only guarantee is that C:\Program Files\Git\cmd\git.exe will work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LukeShu LukeShu LukeShu left review comments

@landstander668 landstander668 landstander668 left review comments

@derrickstolee derrickstolee derrickstolee approved these changes

@tranhieu0807 tranhieu0807 tranhieu0807 approved these changes

@rimrul rimrul Awaiting requested review from rimrul

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.32.0(w)
Development

Successfully merging this pull request may close these issues.

git-subtree installation is broken
6 participants
@dscho @r-ryabyy @LukeShu @derrickstolee @landstander668 @tranhieu0807