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.

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

vim uses unix style EOL which breaks plugin usage and conflicts with native vim #364

Closed
rmrfchik opened this issue Sep 8, 2015 · 10 comments

Comments

@rmrfchik
Copy link

rmrfchik commented Sep 8, 2015

Vim shipped with git uses unix style EOL.
Git uses windows style EOL (it can be configured, but convenient way is to use windows styIe on Windows).
if user want to use plugin manager (for example vim-plug) with shipped vim, it will break vim experience:
vim uses git to checkout plugin, git uses CRLF, vim can't load checkouted plugin.

@dscho
Copy link
Member

dscho commented Sep 8, 2015

Isn't this a duplicate?

@rmrfchik
Copy link
Author

rmrfchik commented Sep 8, 2015

Did some digging and found #272
Issue is closed, but what is resolution? seems like MSYS2-packages/vim isn't fixed.
So, "won't fix", "invalid", "resolved"?

@dscho
Copy link
Member

dscho commented Sep 8, 2015

More like "help wanted": #272 (comment)

@rmrfchik
Copy link
Author

rmrfchik commented Sep 9, 2015

Well, trying to fix using instructions in #272:

paul@nb-paulu MSYS /
$ cd /usr/src/MSYS2-packages/vim

paul@nb-paulu MSYS /usr/src/MSYS2-packages/vim (master)
$ makepkg -s
==> ОШИБКА: Не удалось найти исполняемый файл strip, необходимый для очистки объектных файлов.

paul@nb-paulu MSYS /usr/src/MSYS2-packages/vim (master)
$ strip
bash: strip: команда не найдена

paul@nb-paulu MSYS /usr/src/MSYS2-packages/vim (master)
$

The error is command not found. There is strip in mingw thought:

paul@nb-paulu MINGW64 /usr/src/MSYS2-packages (master)
$ strip --version
GNU strip (GNU Binutils) 2.25.1
Copyright (C) 2014 Free Software Foundation, Inc.

Any ideas?

@dscho
Copy link
Member

dscho commented Sep 9, 2015

You need to install binutils via

pacman -S binutils

(I thought that the Git for Windows SDK already installed that by default.)

@dscho
Copy link
Member

dscho commented Sep 9, 2015

I fixed the comment as well as the wiki page about Package management.

@rmrfchik
Copy link
Author

Sorry, I'm very new to windows git sdk and msys, so I can't handle it correctly

paul@nb-paulu MSYS /usr/src/MSYS2-packages/vim (master)
$ git pull
Already up-to-date.

paul@nb-paulu MSYS /usr/src/MSYS2-packages/vim (master)
$ LANG=C makepkg -s
==> Making package: vim 7.4.728-1 (Fri Sep 11 09:24:38 MSK 2015)
==> Checking runtime dependencies...
==> Checking buildtime dependencies...
==> Retrieving sources...
==> ERROR: vim-7.4.728.tar.xz was not found in the build directory and is not a URL.

paul@nb-paulu MSYS /usr/src/MSYS2-packages/vim (master)

@dscho
Copy link
Member

dscho commented Sep 11, 2015

Have a look in the PKGBUILD file. It should be relatively easy to follow where the URL is specified from which it tries to download the vim sources. It is quite possible that they are no longer available at that version, so you could simply try to upgrade to a newer version. Just find out what the newest version is from vim's home page and adjust the URL accordingly.

@dscho
Copy link
Member

dscho commented Sep 11, 2015

Please note that upstream just updated vim to a newer version. You might want to verify first that the newer version still exposes the problem (call pacman -Syu in your SDK to update all packages to the current version), and if it does, you need to git pull origin master in /usr/src/MSYS2-packages/ first, before calling makepkg -s in the vim/ subdirectory again.

dscho added a commit to dscho/MSYS2-packages that referenced this issue Sep 15, 2015
When sharing Windows' home directory, we have to expect that the
`.vimrc` file can have DOS line endings.

Let's be lenient about this, as well as all other input we get, and just
handle CR/LF as well as LF line endings.

We still behave as before, otherwise.

This fixes git-for-windows/git#272 and
git-for-windows/git#364

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit to dscho/MSYS2-packages that referenced this issue Sep 15, 2015
When sharing Windows' home directory, we have to expect that the
`.vimrc` file can have DOS line endings.

Let's be lenient about this, as well as all other input we get, and just
handle CR/LF as well as LF line endings.

We still behave as before, otherwise.

This fixes git-for-windows/git#272 and
git-for-windows/git#364

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho added a commit to dscho/MSYS2-packages that referenced this issue Sep 15, 2015
When sharing Windows' home directory, we have to expect that the
`.vimrc` file can have DOS line endings.

Let's be lenient about this, as well as all other input we get, and just
handle CR/LF as well as LF line endings.

We still behave as before, otherwise.

This fixes git-for-windows/git#272 and
git-for-windows/git#364

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

dscho commented Sep 16, 2015

As of vim-7.4.872-2, this is fixed.

@dscho dscho closed this as completed Sep 16, 2015
jeffhostetler pushed a commit to jeffhostetler/git that referenced this issue Jul 2, 2021
Replaces git-for-windows#367, which used the upstream commits directly. This instead includes a merge commit onto `vfs-2.32.0` so we can move forward even if the upstream version is modified.

This integrates the sparse-index with `git status`. There is a LOT of code here, and much of it makes future changes (git-for-windows#361 and git-for-windows#364) much simpler than they would be otherwise.

This merges into `features/sparse-index` which is intended to be released as an experimental release. The goal of reviewing this PR is to find "good enough for a limited release to dogfooders" and not the same scrutiny of upstream.

In particular, I am currently looking for an issue with directory/file conflicts at the sparse-checkout boundary. They don't reveal themselves until `git checkout`, and only in very rare cases that won't affect our dogfooders.
jeffhostetler pushed a commit to jeffhostetler/git that referenced this issue Jul 2, 2021
…se-index

This follows git-for-windows#374 and git-for-windows#361 to complete the necessary functionality for the sparse-index experimental release.

This does not include the behavior changes requested upstream. The request is about how `git add` currently ignores changes that match a tracked path outside of the sparse-checkout definition. However, this is an established behavior of Git, so we don't need to change it for our dogfooders.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants