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

vim-patch.sh: Use git-rev-parse to confirm .vim-src is a git repo #8875

Merged
merged 1 commit into from Aug 20, 2018
Merged

vim-patch.sh: Use git-rev-parse to confirm .vim-src is a git repo #8875

merged 1 commit into from Aug 20, 2018

Conversation

jamessan
Copy link
Member

Explicitly checking for the .git/ directory doesn't work in various
situations (e.g., git-worktree).

[ci skip]

@jamessan
vim-patch.sh: Use git-rev-parse to confirm .vim-src is a git repo
3c2ecf2 
Explicitly checking for the .git/ directory doesn't work in various
situations (e.g., git-worktree).

[ci skip]
@justinmk justinmk merged commit c05d715 into neovim:master Aug 20, 2018
justinmk added a commit that referenced this pull request Aug 21, 2018
@justinmk
vim-patch.sh: Also check for .git/ directory
8872fce 
In the case of nested repos, such as when "neovim/" repo contains
"neovim/.vim-src/" repo,
    git rev-parse --show-toplevel
returns the fullpath to the "neovim/" repo, which failed the condition.

ref #8875
ref c05d715
@justinmk
Copy link
Member

This broke my case, where I have .vim-src/ living in my neovim/ repo. Hopefully 8872fce covers all cases.

@jamessan jamessan deleted the worktree-support branch August 21, 2018 11:21
@jamessan
Copy link
Member Author

Weird. That setup works fine for me without your changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jamessan @justinmk