Handle worktrees at the top of a network drive #141
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The first offset in a UNC path is not the host name, but the folder name after that. This fixes git-for-windows#1181 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A very common assumption in Git's source code base is that offset_1st_component() returns either 0 for relative paths, or 1 for absolute paths that start with a slash. In other words, the return value is either 0 or points just after the dir separator. This assumption is not fulfilled when calling offset_1st_component() e.g. on UNC paths on Windows, e.g. "//my-server/my-share". In this case, offset_1st_component() returns the length of the entire string (which is correct, because stripping the last "component" would not result in a valid directory), yet the return value still does not point just after a dir separator. This assumption is most prominently seen in the setup_git_directory_gently_1() function, where we want to append a ".git" component and simply assume that there is already a dir separator. In the UNC example given above, this assumption is incorrect. As a consequence, Git will fail to handle a worktree at the top of a UNC share correctly. Let's fix this by adding a dir separator specifically for that case: we found that there is no first component in the path and it does not end in a dir separator? Then add it. This fixes git-for-windows#1320 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When working in the root directory of a file share (this is only possible in Git Bash and Powershell, but not in CMD), the current directory is reported without a trailing slash. This is different from Unix and standard Windows directories: both / and C:\ are reported with a trailing slash as current directories. If a Git worktree is located there, Git is not quite prepared for that: while it does manage to find the .git directory/file, it returns as length of the top-level directory's path *one more* than the length of the current directory, and setup_git_directory_gently() would then return an undefined string as prefix. In practice, this undefined string usually points to NUL bytes, and does not cause much harm. Under rare circumstances that are really involved to reproduce (and not reliably so), the reported prefix could be a suffix string of Git's exec path, though. A careful analysis determined that this bug is unlikely to be exploitable, therefore we mark this as a regular bug fix. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
This PR supersedes #65. |
35 tasks
|
/submit |
|
Submitted as pull.141.git.gitgitgadget@gmail.com |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): |
|
This branch is now known as |
|
This patch series was integrated into pu via git@39c3430. |
|
This patch series was integrated into pu via git@a4110bd. |
|
This patch series was integrated into pu via git@beae6da. |
|
This patch series was integrated into pu via git@b960f22. |
|
This patch series was integrated into pu via git@b693753. |
|
This patch series was integrated into pu via git@e8ced64. |
|
This patch series was integrated into next via git@70ccc59. |
|
This patch series was integrated into pu via git@535c5ae. |
|
This patch series was integrated into pu via git@e79ced2. |
|
This patch series was integrated into pu via git@7df2cf2. |
|
This patch series was integrated into pu via git@49c6612. |
|
This patch series was integrated into pu via git@b57a88a. |
|
This patch series was integrated into master via git@b57a88a. |
|
Closed via b57a88a. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Windows' network drive concept is a quite useful and versatile one. Once authenticated, one can even change the working directory to a network drive (
cd \\server\share, works in PowerShell and Git Bash).Some users want to have their Git repositories there, and with these patches, that works, even.
This is yet another patch series in the seemingly endless stream of Git for Windows patches.