Git under windows: MSYS or Cygwin?

Question

I plan to migrate my projects over to git, and I'm currently wondering which is the best and / or most stable option under windows.

From what I gather I basically have 2.5 options:

1. MSYSgit
2. git under Cygwin
3. (aka 2.5) MSYSgit from a Cygwin prompt (given that Cygwin git is already installed).

Note: IMO Cygwin in itself is a big plus as you can have access to pretty much all the *nix command line tools, as where with MSYSgit bash, you only have access to a rather small subset of these tools.

Given that, what option would you suggest?

Answer 1

I've dabbled with using both the MSYS and Cygwin versions of git, and to be really honest, I didn't find either experience especially good. I just don't think git is really ready for windows yet.

That being said, one issue I found with the MSYS version is that it would convert the line-endings on your (non-binary) files from UNIX style (line-feed) to DOS style (carriage-return/line-feed). You may consider this a bug or a feature, but there is no way to change the behaviour that I could find. (EDIT: Set the configuration variable core.autocrlf to false. Thanks Brian.)

OTOH, the MSYS version of git has some GUI functionality that isn't available in the cygwin version unless you want to install and run a whole X server. (Thanks Joce for confirming this.)

My impression is that the MSYS version is more popular, although that may be because you don't need to install a cygwin ecosystem to use it. (And I agree, cygwin is extremely useful.)

Personally, I would go with either Bazaar or Mercurial, either of which have better support for windows IMO.

Answer 2

Both Cygwin and Msys Git work fairly well for normal use-cases. If you want to use scripts such as git-svn, Cygwin is a better bet. As an old Windows users who finally jumped ship to Linux, I can definitely say that Cygwin is a great boon and worth having in and of itself.

Context is important though; what projects are these? Who are they used by? Etc.

Answer 3

I have no problem with the latest version of MsysMGit:
I use the option 2, which means I only add the git\bin directory to the PATH environment variable, but without overriding some built-in windows tools.

I managed to defined external tools like Notepad++ and WinMerge (or DiffMerge)

I did run successfully scripts like svn2git because, from MsysGit1.6.2+, it does include the 'git svn' command.

And finally I look forward to MsysGit1.6.2.3 for it will include finally 'git filter-branch' command! (a slow version of filter-branch, but still).

For the Unix command, I prefer to install a GnuWin32 coreutils package, and use them only when I need them.

So all in all, I do not use the Cygwin layer, and managed to run Git very well in its Windows-based release MsysGit.

Answer 4

I have reservations towards CygWin because I only want git and not any of the other tools that Cygwin wants to shove in. Normally you want your windows computer to work like a windows computer and CygWin wants to slap on something completely different. Slapping on *nix functionality just for the kicks is not to go.

The thing is, if I ever want to work with *nix like command line, I'd go over to my Linux machine and work on that computer instead. Virtual computers and remote desktops work like a charm nowadays and is accessible enough for developers.

There really needs to be a legitimate reason for you to be using CygWin. If it is just for using git I'd suggest you use MSysGit instead which is my preference. It works really well with the gitk and git-gui tools that are bundled. I've been working on both Eclipse and Visual Studio using msysgit and it works like a charm.

The only thing I'm waiting for now is a fully working Tortoise clone for git.

Answer 5

I have run into serious bugs in MSys's cygwin implementation: some commands, especially the rebase, were quite prone to failure. Cygwin's was much more stable for me.

That said, it was a month ago, might have improved since.

Answer 6

I currently use Msysgit together with TortoiseGit.

The MsysGit UI isn't really to my liking so I use a familiar tool like TortoiseGit and when working on the commandline (most of the time), I use the git binary from Msysgit

Answer 7

I have used both Cygwin Git and Msysgit with Windows. I would suggest using Cygwin + Git. Cygwin 1.7 (currently in beta) addresses a major nuance (at least for me) while using git gui and gitk. Earlier versions of Cygwin used to open 10s of cmd windows every time I do something in git-gui or gitk. This has been addressed in 1.7. Cygwin's powerful shell brings in a lot of the goodies of linux terminal as well.

That said, Msysgit has evolved quite a bit and is really useful in Windows. I faced a couple of issues though.

Permission issue: a few files created natively in windows had mode 755 which got converted to 644 while using Msysgit. This would show up as modified files. A checkin should fix this issue.

CRLF: The all elusive CRLF as usual creates issues in Windows. Msysgit might report files as modified. This can be fixed by selecting "Leave line endings unchanged" (forgot the exact text) while installing Msysgit.

Daemon: And yeah I'm still finding it tough to setup git daemon in Msysgit.

Answer 8

I've also tested both worlds (CygWin and MSysgit), my experiences is also that there are some shortcomings in the MSysgit bash. Unable to run git stash sucessfully while Cygwin handled it gracefully on the same git repo.

No deep analysis done yet, though...