summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-09-10 18:43:31 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-09-10 19:16:30 -0400
commit624e2ec84e537a20301a0fda6ceb4151a5ec61e4 (patch)
treec456d3d259b037987b4689a71eb0044a17e0f28c /Git
parent09fbe113717531a7bb5806dcf42bb833f14a0e59 (diff)
Switched to using git for Windows, rather than msysgit.
Using msysgit with git-annex is no longer supported. At the same time, I'm updating the rsync.exe in my downloads repository with the one from msys2. Note that rsync is currently still being ldded and installed in Git/cmd/ like the other cygwin programs. The ldd fails and this failure is ignored. It would be better to special case it to go in Git/usr/bin/, so that the user can't run rsync in a dos prompt window, which doesn't work, as it needs additional libs. However, as far as git-annex running rsync running ssh, it works ok in this location. Removed the ssh.cmd and ssh-keygen.cmd; these are not needed with git for windows. Keeping them would let ssh be run manually from a dos prompt window, but that's not really a goal.
Diffstat (limited to 'Git')
-rw-r--r--Git/Hook.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/Hook.hs b/Git/Hook.hs
index aec2563f4..f4424c60e 100644
--- a/Git/Hook.hs
+++ b/Git/Hook.hs
@@ -81,7 +81,7 @@ runHook h r = do
#ifndef mingw32_HOST_OS
findcmd = defcmd
#else
- {- Like msysgit, parse the first line of the hook file,
+ {- Like git for windows, parse the first line of the hook file,
- look for "#!", and dispatch the interpreter on the file. -}
findcmd f = do
l <- headMaybe . lines <$> catchDefaultIO "" (readFile f)