Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge tag 'tags/Git-1.7.11-preview20120710' into devel

Git for Windows 1.7.11-preview20120710
  • Loading branch information...
commit 8810fd5c2c79c73adcc73fd0825f3b32fdb816e7 2 parents 656cc1e + 663ecd2
@half-ogre half-ogre authored
Showing with 462 additions and 127 deletions.
  1. 0  bin/a2p.exe
  2. 0  bin/antiword.exe
  3. 0  bin/astextplain
  4. 0  bin/awk
  5. 0  bin/basename.exe
  6. 0  bin/bison.exe
  7. 0  bin/bunzip2
  8. 0  bin/bzip2.exe
  9. 0  bin/c2ph
  10. 0  bin/c_rehash
  11. 0  bin/cat.exe
  12. 0  bin/ccache.exe
  13. 0  bin/chmod.exe
  14. 0  bin/clear
  15. 0  bin/cmd
  16. 0  bin/cmp.exe
  17. 0  bin/cp.exe
  18. 0  bin/cpan
  19. 0  bin/cut.exe
  20. 0  bin/cvs.exe
  21. 0  bin/date.exe
  22. 0  bin/dd.exe
  23. 0  bin/diff.exe
  24. 0  bin/diff3.exe
  25. 0  bin/dirname.exe
  26. 0  bin/docx2txt
  27. 0  bin/dprofpp
  28. 0  bin/du.exe
  29. 0  bin/echo
  30. 0  bin/egrep
  31. 0  bin/enc2xs
  32. 0  bin/env.exe
  33. 0  bin/expr.exe
  34. 0  bin/false.exe
  35. 0  bin/fgrep
  36. 0  bin/find.exe
  37. 0  bin/find2perl
  38. 0  bin/flex.exe
  39. 0  bin/funzip.exe
  40. 0  bin/gawk.exe
  41. 0  bin/googlecode_upload.py
  42. 0  bin/grep.exe
  43. 0  bin/gvim
  44. 0  bin/h2ph
  45. 0  bin/h2xs
  46. 0  bin/head.exe
  47. 0  bin/iconv.exe
  48. 0  bin/id.exe
  49. 0  bin/info.exe
  50. 0  bin/infokey.exe
  51. 0  bin/install-info.exe
  52. 0  bin/install.exe
  53. 0  bin/instmodsh
  54. 0  bin/kill.exe
  55. 0  bin/ld2
  56. 0  bin/ldd-light
  57. 0  bin/less.exe
  58. 0  bin/lessecho.exe
  59. 0  bin/lesskey.exe
  60. 0  bin/libW11.dll
  61. 0  bin/libapr-0-0.dll
  62. 0  bin/libaprutil-0-0.dll
  63. 0  bin/libexpat-0.dll
  64. 0  bin/libintl3.dll
  65. 0  bin/libneon-25.dll
  66. 0  bin/libnetcfg
  67. 0  bin/libsvn_client-1-0.dll
  68. 0  bin/libsvn_delta-1-0.dll
  69. 0  bin/libsvn_diff-1-0.dll
  70. 0  bin/libsvn_fs-1-0.dll
  71. 0  bin/libsvn_fs_fs-1-0.dll
  72. 0  bin/libsvn_ra-1-0.dll
  73. 0  bin/libsvn_ra_dav-1-0.dll
  74. 0  bin/libsvn_ra_local-1-0.dll
  75. 0  bin/libsvn_ra_svn-1-0.dll
  76. 0  bin/libsvn_repos-1-0.dll
  77. 0  bin/libsvn_subr-1-0.dll
  78. 0  bin/libsvn_swig_perl-1-0.dll
  79. 0  bin/libsvn_wc-1-0.dll
  80. 0  bin/libz.dll
  81. 0  bin/ln.exe
  82. 0  bin/ls.exe
  83. 0  bin/m4.exe
  84. 0  bin/make.exe
  85. 0  bin/makeinfo.exe
  86. 0  bin/md5sum.exe
  87. 0  bin/mkdir.exe
  88. 0  bin/mount.exe
  89. 0  bin/msvc-build
  90. 0  bin/msys-crypto-0.9.8.dll
  91. 0  bin/msys-minires.dll
  92. 0  bin/msys-perl5_6.dll
  93. 0  bin/msys-perl5_8.dll
  94. 0  bin/msys-regex-1.dll
  95. 0  bin/msys-rxvt.bat
  96. 0  bin/msys-ssl-0.9.8.dll
  97. 0  bin/msys-z.dll
  98. 0  bin/msysinfo
  99. 0  bin/msysltdl-3.dll
  100. 0  bin/mv.exe
  101. 0  bin/od.exe
  102. 0  bin/openssl.exe
  103. 0  bin/patch.exe
  104. 0  bin/pdftexi2dvi
  105. 0  bin/perl.exe
  106. 0  bin/perl5.8.8.exe
  107. 0  bin/perlbug
  108. 0  bin/perlcc
  109. 0  bin/perldoc
  110. 0  bin/perlivp
  111. 0  bin/perlld
  112. 0  bin/piconv
  113. 0  bin/pl2pm
  114. 0  bin/pod2html
  115. 0  bin/pod2latex
  116. 0  bin/pod2man
  117. 0  bin/pod2text
  118. 0  bin/pod2usage
  119. 0  bin/podchecker
  120. 0  bin/podselect
  121. 0  bin/printf
  122. 0  bin/prove
  123. 0  bin/ps.exe
  124. 0  bin/psed
  125. 0  bin/pstruct
  126. 0  bin/pthreadGC2.dll
  127. 0  bin/pwd
  128. 0  bin/recodetree
  129. 0  bin/rm.exe
  130. 0  bin/rmdir.exe
  131. 0  bin/rsh.exe
  132. 0  bin/rxvt.exe
  133. 0  bin/s2p
  134. 0  bin/scp.exe
  135. 0  bin/sed.exe
  136. 0  bin/sftp.exe
  137. 0  bin/sleep.exe
  138. 0  bin/slogin
  139. 0  bin/slogin.exe
  140. 0  bin/sort.exe
  141. 0  bin/splain
  142. 0  bin/split.exe
  143. 0  bin/ssh-add.exe
  144. 0  bin/ssh-agent.exe
  145. 0  bin/ssh-keygen.exe
  146. 0  bin/ssh-keyscan.exe
  147. 0  bin/ssh.exe
  148. 0  bin/start
  149. 0  bin/stat.exe
  150. 0  bin/svn.exe
  151. 0  bin/svnadmin.exe
  152. 0  bin/svndumpfilter.exe
  153. 0  bin/svnlook.exe
  154. 0  bin/svnserve.exe
  155. 0  bin/svnsync.exe
  156. 0  bin/svnversion.exe
  157. 0  bin/tail.exe
  158. 0  bin/tar.exe
  159. 0  bin/tee.exe
  160. 0  bin/texi2dvi
  161. 0  bin/texi2pdf
  162. 0  bin/texindex.exe
  163. 0  bin/touch.exe
  164. 0  bin/tr.exe
  165. 0  bin/true.exe
  166. 0  bin/uname.exe
  167. 0  bin/uniq.exe
  168. 0  bin/unzip.exe
  169. 0  bin/unzipsfx.exe
  170. 0  bin/vi
  171. 0  bin/vim
  172. 0  bin/wc.exe
  173. 0  bin/which
  174. 0  bin/wordpad
  175. 0  bin/xargs.exe
  176. 0  bin/xsubpp
  177. 0  bin/yacc
  178. +0 −36 cmd/git.cmd
  179. BIN  cmd/git.exe
  180. +1 −1  git
  181. +89 −0 mingw/bin/curl-ca-bundle.crt
  182. +29 −5 share/WinGit/ReleaseNotes.rtf
  183. +1 −0  share/WinGit/copy-files.sh
  184. +3 −1 share/WinGit/install.iss
  185. +11 −5 share/WinGit/putty.inc.iss
  186. +5 −5 share/msysGit/merging-rebase.sh
  187. BIN  share/resources/git.bmp
  188. BIN  share/resources/git.ico
  189. +0 −74 share/resources/gitlogo.svg
  190. BIN  share/resources/gitsmall.bmp
  191. +42 −0 src/curl/certs/cacert.class3.pem
  192. +41 −0 src/curl/certs/cacert.root.pem
  193. +4 −0 src/git-wrapper/.gitignore
  194. +16 −0 src/git-wrapper/Makefile
  195. +199 −0 src/git-wrapper/git-wrapper.c
  196. +21 −0 src/git-wrapper/release.sh
View
0  bin/a2p.exe 100644 → 100755
File mode changed
View
0  bin/antiword.exe 100644 → 100755
File mode changed
View
0  bin/astextplain 100644 → 100755
File mode changed
View
0  bin/awk 100644 → 100755
File mode changed
View
0  bin/basename.exe 100644 → 100755
File mode changed
View
0  bin/bison.exe 100644 → 100755
File mode changed
View
0  bin/bunzip2 100644 → 100755
File mode changed
View
0  bin/bzip2.exe 100644 → 100755
File mode changed
View
0  bin/c2ph 100644 → 100755
File mode changed
View
0  bin/c_rehash 100644 → 100755
File mode changed
View
0  bin/cat.exe 100644 → 100755
File mode changed
View
0  bin/ccache.exe 100644 → 100755
File mode changed
View
0  bin/chmod.exe 100644 → 100755
File mode changed
View
0  bin/clear 100644 → 100755
File mode changed
View
0  bin/cmd 100644 → 100755
File mode changed
View
0  bin/cmp.exe 100644 → 100755
File mode changed
View
0  bin/cp.exe 100644 → 100755
File mode changed
View
0  bin/cpan 100644 → 100755
File mode changed
View
0  bin/cut.exe 100644 → 100755
File mode changed
View
0  bin/cvs.exe 100644 → 100755
File mode changed
View
0  bin/date.exe 100644 → 100755
File mode changed
View
0  bin/dd.exe 100644 → 100755
File mode changed
View
0  bin/diff.exe 100644 → 100755
File mode changed
View
0  bin/diff3.exe 100644 → 100755
File mode changed
View
0  bin/dirname.exe 100644 → 100755
File mode changed
View
0  bin/docx2txt 100644 → 100755
File mode changed
View
0  bin/dprofpp 100644 → 100755
File mode changed
View
0  bin/du.exe 100644 → 100755
File mode changed
View
0  bin/echo 100644 → 100755
File mode changed
View
0  bin/egrep 100644 → 100755
File mode changed
View
0  bin/enc2xs 100644 → 100755
File mode changed
View
0  bin/env.exe 100644 → 100755
File mode changed
View
0  bin/expr.exe 100644 → 100755
File mode changed
View
0  bin/false.exe 100644 → 100755
File mode changed
View
0  bin/fgrep 100644 → 100755
File mode changed
View
0  bin/find.exe 100644 → 100755
File mode changed
View
0  bin/find2perl 100644 → 100755
File mode changed
View
0  bin/flex.exe 100644 → 100755
File mode changed
View
0  bin/funzip.exe 100644 → 100755
File mode changed
View
0  bin/gawk.exe 100644 → 100755
File mode changed
View
0  bin/googlecode_upload.py 100644 → 100755
File mode changed
View
0  bin/grep.exe 100644 → 100755
File mode changed
View
0  bin/gvim 100644 → 100755
File mode changed
View
0  bin/h2ph 100644 → 100755
File mode changed
View
0  bin/h2xs 100644 → 100755
File mode changed
View
0  bin/head.exe 100644 → 100755
File mode changed
View
0  bin/iconv.exe 100644 → 100755
File mode changed
View
0  bin/id.exe 100644 → 100755
File mode changed
View
0  bin/info.exe 100644 → 100755
File mode changed
View
0  bin/infokey.exe 100644 → 100755
File mode changed
View
0  bin/install-info.exe 100644 → 100755
File mode changed
View
0  bin/install.exe 100644 → 100755
File mode changed
View
0  bin/instmodsh 100644 → 100755
File mode changed
View
0  bin/kill.exe 100644 → 100755
File mode changed
View
0  bin/ld2 100644 → 100755
File mode changed
View
0  bin/ldd-light 100644 → 100755
File mode changed
View
0  bin/less.exe 100644 → 100755
File mode changed
View
0  bin/lessecho.exe 100644 → 100755
File mode changed
View
0  bin/lesskey.exe 100644 → 100755
File mode changed
View
0  bin/libW11.dll 100644 → 100755
File mode changed
View
0  bin/libapr-0-0.dll 100644 → 100755
File mode changed
View
0  bin/libaprutil-0-0.dll 100644 → 100755
File mode changed
View
0  bin/libexpat-0.dll 100644 → 100755
File mode changed
View
0  bin/libintl3.dll 100644 → 100755
File mode changed
View
0  bin/libneon-25.dll 100644 → 100755
File mode changed
View
0  bin/libnetcfg 100644 → 100755
File mode changed
View
0  bin/libsvn_client-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_delta-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_diff-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_fs-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_fs_fs-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_ra-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_ra_dav-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_ra_local-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_ra_svn-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_repos-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_subr-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_swig_perl-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libsvn_wc-1-0.dll 100644 → 100755
File mode changed
View
0  bin/libz.dll 100644 → 100755
File mode changed
View
0  bin/ln.exe 100644 → 100755
File mode changed
View
0  bin/ls.exe 100644 → 100755
File mode changed
View
0  bin/m4.exe 100644 → 100755
File mode changed
View
0  bin/make.exe 100644 → 100755
File mode changed
View
0  bin/makeinfo.exe 100644 → 100755
File mode changed
View
0  bin/md5sum.exe 100644 → 100755
File mode changed
View
0  bin/mkdir.exe 100644 → 100755
File mode changed
View
0  bin/mount.exe 100644 → 100755
File mode changed
View
0  bin/msvc-build 100644 → 100755
File mode changed
View
0  bin/msys-crypto-0.9.8.dll 100644 → 100755
File mode changed
View
0  bin/msys-minires.dll 100644 → 100755
File mode changed
View
0  bin/msys-perl5_6.dll 100644 → 100755
File mode changed
View
0  bin/msys-perl5_8.dll 100644 → 100755
File mode changed
View
0  bin/msys-regex-1.dll 100644 → 100755
File mode changed
View
0  bin/msys-rxvt.bat 100644 → 100755
File mode changed
View
0  bin/msys-ssl-0.9.8.dll 100644 → 100755
File mode changed
View
0  bin/msys-z.dll 100644 → 100755
File mode changed
View
0  bin/msysinfo 100644 → 100755
File mode changed
View
0  bin/msysltdl-3.dll 100644 → 100755
File mode changed
View
0  bin/mv.exe 100644 → 100755
File mode changed
View
0  bin/od.exe 100644 → 100755
File mode changed
View
0  bin/openssl.exe 100644 → 100755
File mode changed
View
0  bin/patch.exe 100644 → 100755
File mode changed
View
0  bin/pdftexi2dvi 100644 → 100755
File mode changed
View
0  bin/perl.exe 100644 → 100755
File mode changed
View
0  bin/perl5.8.8.exe 100644 → 100755
File mode changed
View
0  bin/perlbug 100644 → 100755
File mode changed
View
0  bin/perlcc 100644 → 100755
File mode changed
View
0  bin/perldoc 100644 → 100755
File mode changed
View
0  bin/perlivp 100644 → 100755
File mode changed
View
0  bin/perlld 100644 → 100755
File mode changed
View
0  bin/piconv 100644 → 100755
File mode changed
View
0  bin/pl2pm 100644 → 100755
File mode changed
View
0  bin/pod2html 100644 → 100755
File mode changed
View
0  bin/pod2latex 100644 → 100755
File mode changed
View
0  bin/pod2man 100644 → 100755
File mode changed
View
0  bin/pod2text 100644 → 100755
File mode changed
View
0  bin/pod2usage 100644 → 100755
File mode changed
View
0  bin/podchecker 100644 → 100755
File mode changed
View
0  bin/podselect 100644 → 100755
File mode changed
View
0  bin/printf 100644 → 100755
File mode changed
View
0  bin/prove 100644 → 100755
File mode changed
View
0  bin/ps.exe 100644 → 100755
File mode changed
View
0  bin/psed 100644 → 100755
File mode changed
View
0  bin/pstruct 100644 → 100755
File mode changed
View
0  bin/pthreadGC2.dll 100644 → 100755
File mode changed
View
0  bin/pwd 100644 → 100755
File mode changed
View
0  bin/recodetree 100644 → 100755
File mode changed
View
0  bin/rm.exe 100644 → 100755
File mode changed
View
0  bin/rmdir.exe 100644 → 100755
File mode changed
View
0  bin/rsh.exe 100644 → 100755
File mode changed
View
0  bin/rxvt.exe 100644 → 100755
File mode changed
View
0  bin/s2p 100644 → 100755
File mode changed
View
0  bin/scp.exe 100644 → 100755
File mode changed
View
0  bin/sed.exe 100644 → 100755
File mode changed
View
0  bin/sftp.exe 100644 → 100755
File mode changed
View
0  bin/sleep.exe 100644 → 100755
File mode changed
View
0  bin/slogin 100644 → 100755
File mode changed
View
0  bin/slogin.exe 100644 → 100755
File mode changed
View
0  bin/sort.exe 100644 → 100755
File mode changed
View
0  bin/splain 100644 → 100755
File mode changed
View
0  bin/split.exe 100644 → 100755
File mode changed
View
0  bin/ssh-add.exe 100644 → 100755
File mode changed
View
0  bin/ssh-agent.exe 100644 → 100755
File mode changed
View
0  bin/ssh-keygen.exe 100644 → 100755
File mode changed
View
0  bin/ssh-keyscan.exe 100644 → 100755
File mode changed
View
0  bin/ssh.exe 100644 → 100755
File mode changed
View
0  bin/start 100644 → 100755
File mode changed
View
0  bin/stat.exe 100644 → 100755
File mode changed
View
0  bin/svn.exe 100644 → 100755
File mode changed
View
0  bin/svnadmin.exe 100644 → 100755
File mode changed
View
0  bin/svndumpfilter.exe 100644 → 100755
File mode changed
View
0  bin/svnlook.exe 100644 → 100755
File mode changed
View
0  bin/svnserve.exe 100644 → 100755
File mode changed
View
0  bin/svnsync.exe 100644 → 100755
File mode changed
View
0  bin/svnversion.exe 100644 → 100755
File mode changed
View
0  bin/tail.exe 100644 → 100755
File mode changed
View
0  bin/tar.exe 100644 → 100755
File mode changed
View
0  bin/tee.exe 100644 → 100755
File mode changed
View
0  bin/texi2dvi 100644 → 100755
File mode changed
View
0  bin/texi2pdf 100644 → 100755
File mode changed
View
0  bin/texindex.exe 100644 → 100755
File mode changed
View
0  bin/touch.exe 100644 → 100755
File mode changed
View
0  bin/tr.exe 100644 → 100755
File mode changed
View
0  bin/true.exe 100644 → 100755
File mode changed
View
0  bin/uname.exe 100644 → 100755
File mode changed
View
0  bin/uniq.exe 100644 → 100755
File mode changed
View
0  bin/unzip.exe 100644 → 100755
File mode changed
View
0  bin/unzipsfx.exe 100644 → 100755
File mode changed
View
0  bin/vi 100644 → 100755
File mode changed
View
0  bin/vim 100644 → 100755
File mode changed
View
0  bin/wc.exe 100644 → 100755
File mode changed
View
0  bin/which 100644 → 100755
File mode changed
View
0  bin/wordpad 100644 → 100755
File mode changed
View
0  bin/xargs.exe 100644 → 100755
File mode changed
View
0  bin/xsubpp 100644 → 100755
File mode changed
View
0  bin/yacc 100644 → 100755
File mode changed
View
36 cmd/git.cmd
@@ -1,36 +0,0 @@
-@rem Do not use "echo off" to not affect any child calls.
-@setlocal
-
-@rem Get the abolute path to the parent directory, which is assumed to be the
-@rem Git installation root.
-@for /F "delims=" %%I in ("%~dp0..") do @set git_install_root=%%~fI
-@set PATH=%git_install_root%\bin;%git_install_root%\mingw\bin;%PATH%
-
-@if not exist "%HOME%" @set HOME=%HOMEDRIVE%%HOMEPATH%
-@if not exist "%HOME%" @set HOME=%USERPROFILE%
-
-@set PLINK_PROTOCOL=ssh
-@if not defined TERM set TERM=msys
-
-@if "%1"=="gui" @goto gui
-
-:default
-@rem Get the current console ("OEM") codepage.
-@for /f %%i in ('getcp -oem') do @set cp_oem=%%i
-@rem Get the current GUI ("ANSI") codepage.
-@for /f %%i in ('getcp -ansi') do @set cp_ansi=%%i
-@rem Set the console codepage to match the GUI codepage.
-@chcp %cp_ansi% > nul < nul
-@git.exe %*
-@set ErrorLevel=%ErrorLevel%
-@rem Restore the original console codepage.
-@chcp %cp_oem% > nul < nul
-@goto quit
-
-:gui
-@if "%2"=="citool" @goto default
-@for /f "tokens=1-1*" %%a in ("%*") do @set args=%%b
-@start "git-gui" wish.exe "%git_install_root%\libexec\git-core\git-gui" -- %args%
-
-:quit
-@"%COMSPEC%" /c exit /b %ErrorLevel%
View
BIN  cmd/git.exe
Binary file not shown
2  git
@@ -1 +1 @@
-Subproject commit 47a8d138da2ae19d416d4d3435bf6c69d478d0c0
+Subproject commit 5c725324e518f12392ac7df8e471ed64ff04ed44
View
89 mingw/bin/curl-ca-bundle.crt
@@ -3400,3 +3400,92 @@ gQAT9vvcnJaGGE67YJvt1VgsMt6wHFgLZo9vOZF9/Bw6a3cm4E/teMuZJe/gxImG
r2H4jMYgwgBonAFwZYpVmpz65vKzZA9vSe9xbxpAl22wLQUFsEH7d3TZjCst3gf1
ZdC+RbpUoH2iXlZhifkdI4ZgOL+KHy3v6+Rv1rGFjvhgRw==
-----END CERTIFICATE-----
+
+cacert.root
+===========
+-----BEGIN CERTIFICATE-----
+MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
+IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
+IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
+Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
+BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
+MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
+ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
+8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
+zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
+fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
+w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
+G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
+epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
+laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
+QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
+fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
+YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
+ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
+gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
+MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
+IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
+dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
+czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
+dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
+aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
+AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
+b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
+ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
+nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
+18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
+gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
+Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
+sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
+SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
+CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
+GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
+zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
+omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
+-----END CERTIFICATE-----
+
+cacert.class3
+=============
+-----BEGIN CERTIFICATE-----
+MIIHWTCCBUGgAwIBAgIDCkGKMA0GCSqGSIb3DQEBCwUAMHkxEDAOBgNVBAoTB1Jv
+b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
+Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
+dEBjYWNlcnQub3JnMB4XDTExMDUyMzE3NDgwMloXDTIxMDUyMDE3NDgwMlowVDEU
+MBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0FjZXJ0
+Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdDCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAKtJNRFIfNImflOUz0Op3SjXQiqL84d4GVh8D57a
+iX3h++tykA10oZZkq5+gJJlz2uJVdscXe/UErEa4w75/ZI0QbCTzYZzA8pD6Ueb1
+aQFjww9W4kpCz+JEjCUoqMV5CX1GuYrz6fM0KQhF5Byfy5QEHIGoFLOYZcRD7E6C
+jQnRvapbjZLQ7N6QxX8KwuPr5jFaXnQ+lzNZ6MMDPWAzv/fRb0fEze5ig1JuLgia
+pNkVGJGmhZJHsK5I6223IeyFGmhyNav/8BBdwPSUp2rVO5J+TJAFfpPBLIukjmJ0
+FXFuC3ED6q8VOJrU0gVyb4z5K+taciX5OUbjchs+BMNkJyIQKopPWKcDrb60LhPt
+XapI19V91Cp7XPpGBFDkzA5CW4zt2/LP/JaT4NsRNlRiNDiPDGCbO5dWOK3z0luL
+oFvqTpa4fNfVoIZwQNORKbeiPK31jLvPGpKK5DR7wNhsX+kKwsOnIJpa3yxdUly6
+R9Wb7yQocDggL9V/KcCyQQNokszgnMyXS0XvOhAKq3A6mJVwrTWx6oUrpByAITGp
+rmB6gCZIALgBwJNjVSKRPFbnr9s6JfOPMVTqJouBWfmh0VMRxXudA/Z0EeBtsSw/
+LIaRmXGapneLNGDRFLQsrJ2vjBDTn8Rq+G8T/HNZ92ZCdB6K4/jc0m+YnMtHmJVA
+BfvpAgMBAAGjggINMIICCTAdBgNVHQ4EFgQUdahxYEyIE/B42Yl3tW3Fid+8sXow
+gaMGA1UdIwSBmzCBmIAUFrUyG9TH8+DmjvO90rA67rI5GNGhfaR7MHkxEDAOBgNV
+BAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAG
+A1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS
+c3VwcG9ydEBjYWNlcnQub3JnggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUH
+AQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggr
+BgEFBQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBB
+MD8GCCsGAQQBgZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9y
+Zy9pbmRleC5waHA/aWQ9MTAwNAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0Fj
+ZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5
+b3VyIG93biBjZXJ0aWZpY2F0ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5D
+QWNlcnQub3JnMA0GCSqGSIb3DQEBCwUAA4ICAQApKIWuRKm5r6R5E/CooyuXYPNc
+7uMvwfbiZqARrjY3OnYVBFPqQvX56sAV2KaC2eRhrnILKVyQQ+hBsuF32wITRHhH
+Va9Y/MyY9kW50SD42CEH/m2qc9SzxgfpCYXMO/K2viwcJdVxjDm1Luq+GIG6sJO4
+D+Pm1yaMMVpyA4RS5qb1MyJFCsgLDYq4Nm+QCaGrvdfVTi5xotSu+qdUK+s1jVq3
+VIgv7nSf7UgWyg1I0JTTrKSi9iTfkuO960NAkW4cGI5WtIIS86mTn9S8nK2cde5a
+lxuV53QtHA+wLJef+6kzOXrnAzqSjiL2jA3k2X4Ndhj3AfnvlpaiVXPAPHG0HRpW
+Q7fDCo1y/OIQCQtBzoyUoPkD/XFzS4pXM+WOdH4VAQDmzEoc53+VGS3FpQyLu7Xt
+hbNc09+4ufLKxw0BFKxwWMWMjTPUnWajGlCVI/xI4AZDEtnNp4Y5LzZyo4AQ5OHz
+0ctbGsDkgJp8E3MGT9ujayQKurMcvEp4u+XjdTilSKeiHq921F73OIZWWonO1sOn
+ebJSoMbxhbQljPI/lrMQ2Y1sVzufb4Y6GIIiNsiwkTjbKqGTqoQ/9SdlrnPVyNXT
+d+pLncdBu8fA46A/5H2kjXPmEkvfoXNzczqA6NXLji/L6hOn1kGLrPo8idck9U60
+4GGSt/M3mMS+lqO3ig==
+-----END CERTIFICATE-----
View
34 share/WinGit/ReleaseNotes.rtf
@@ -1,7 +1,7 @@
{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\fnil\fcharset0 Arial;}{\f2\fnil\fcharset2 Symbol;}}
{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;}
-{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.11-preview20120620)\b0\fs20\par
-Last update: 20 June 2012\par
+{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.11-preview20120710)\b0\fs20\par
+Last update: 10 July 2012\par
\par
\b\fs24 Introduction\b0\fs20\par
\par
@@ -17,10 +17,34 @@ See \cf0{\field{\*\fldinst{HYPERLINK "http://git-scm.com/"}}{\fldrslt{\ul\cf2 ht
{\pntext\f2\'B7\tab}The Quick Launch icon will only be installed for the user running setup (typically the Administrator). This is a technical restriction and will not change.\par
{\pntext\f2\'B7\tab}curl uses $HOME/_netrc instead of $HOME/.netrc.\par
{\pntext\f2\'B7\tab}If you want to specify a different location for --upload-pack, you have to start the absolute path with two slashes. Otherwise MSys will mangle the path.\par
-{\pntext\f2\'B7\tab}If configured to use plink, you will have to connect with putty first and accept the host key.\par
+{\pntext\f2\'B7\tab}If configured to use Plink, you will have to connect with putty first and accept the host key.\par
{\pntext\f2\'B7\tab}As merge tools are executed using the MSys bash, options starting with "/" need to be handled specially: MSys would interpret that as a POSIX path, so you need to double the slash (Issue 226). Example: instead of "/base", say "//base". Also, extra care has to be paid to pass Windows programs Windows paths, as they have no clue about MSys style POSIX paths -- You can use something like $(cmd //c echo "$POSIXPATH").\par
{\pntext\f2\'B7\tab}Unless you define the environment variable MSYS_WATCH_FSTAB (the value must be a non-empty string), Git Bash will not see any drives that have been attached after bash was started. This is a workaround to help the speed of cmd scripts using parts of Git that are implemented as shell scripts.\line\line\pard\li144 Should you encounter other problems, please search the mailing list first (\cf0{\field{\*\fldinst{HYPERLINK "http://groups.google.com/group/msysgit"}}{\fldrslt{\ul\cf2 http://groups.google.com/group/msysgit}}}\cf1\f0\fs20 ) and ask there if you do not find anything.\par
\pard\b\fs24\par
+Licenses\par
+\b0\fs20 This software contains Embedded CAcert Root Certificates. For more information please go to \cf0{\field{\*\fldinst{HYPERLINK "https://www.cacert.org/policy/RootDistributionLicense.php"}}{\fldrslt{\ul\cf2 https://www.cacert.org/policy/RootDistributionLicense.php}}}\cf1\f0\fs20 .\par
+\par
+This package contains software from a number of other projects including zlib, curl, msmtp, tcl/tk, perl, msys and a number of libraries and utilities from the GNU project.\fs24\par
+\b\par
+Changes since Git-1.7.11-preview20120704\par
+\i\fs20\par
+Bugfixes\par
+\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Propagate error codes from git wrapper (issue #43, #45)\par
+{\pntext\f2\'B7\tab}Include CAcert root certificates in SSL bundle (issue #37)\par
+\pard\b\fs24\par
+Changes since Git-1.7.11-preview20120620\par
+\par
+\i\fs20 New Features\par
+\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with the beautiful Git logo from \cf0{\field{\*\fldinst{HYPERLINK "http://git-scm.com/downloads/logos"}}{\fldrslt{\ul\cf2 http://git-scm.com/downloads/logos}}}\cf1\f0\fs20\par
+{\pntext\f2\'B7\tab}The installer no longer asks for the directory and program group when updating\par
+{\pntext\f2\'B7\tab}The installer now also auto-detects TortoisePlink that comes with TortoiseGit\par
+\pard\b\i\par
+Bugfixes\par
+\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Git::SVN is correctly installed again\par
+{\pntext\f2\'B7\tab}The default format for git help is HTML again\par
+{\pntext\f2\'B7\tab}Replaced the git.cmd script with an exe wrapper to fix issue #36\par
+{\pntext\f2\'B7\tab}Fixed executable detection to speed up help -a display.\par
+\pard\b\fs24\par
Changes since Git-1.7.10-preview20120409\par
\par
\i\fs20 New Features\par
@@ -361,7 +385,7 @@ Changes since Git-1.5.5-preview20080413\par
\par
\i\fs20 New Features\par
\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with official git 1.5.6.\par
-{\pntext\f2\'B7\tab}Installer supports configuring a user provided plink (PuTTY).\par
+{\pntext\f2\'B7\tab}Installer supports configuring a user provided Plink (PuTTY).\par
\pard\li144\par
\pard\b\i Bugfixes\b0\i0\par
\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432 Comes with tweaked msys-1.0.dll to solve some command line mangling issues.\par
@@ -369,7 +393,7 @@ Changes since Git-1.5.5-preview20080413\par
{\pntext\f2\'B7\tab}Programs in the system PATH, for example editors, can be launched from Git without specifying their full path.\par
{\pntext\f2\'B7\tab}"git stash apply stash@\{1\}" works.\par
{\pntext\f2\'B7\tab}Comes with basic ANSI control code emulation for the Windows console to avoid wrapping of pull/merge's diffstats.\par
-{\pntext\f2\'B7\tab}Git correctly passes port numbers to PuTTY's plink \par
+{\pntext\f2\'B7\tab}Git correctly passes port numbers to PuTTY's Plink \par
\pard\b\fs24\par
Changes since Git-1.5.4-preview20080202\par
\par
View
1  share/WinGit/copy-files.sh
@@ -99,5 +99,6 @@ cp $MSYSGITROOT/share/WinGit/ReleaseNotes.rtf . &&
sed 's/^\. .*\(git-completion.bash\)/. \/etc\/\1/' \
< $MSYSGITROOT/etc/profile > etc/profile &&
cp $MSYSGITROOT/share/resources/git.ico etc/ &&
+cp $MSYSGITROOT/share/resources/git.ico share/git-gui/lib/git-gui.ico &&
find bin libexec -iname \*.exe -o -iname \*.dll | sort > etc/fileList-bindimage.txt ||
exit 1
View
4 share/WinGit/install.iss
@@ -26,7 +26,9 @@ AppPublisherURL={#APP_URL}
AppVersion={#APP_VERSION}
ChangesEnvironment=yes
DefaultDirName={pf}\{#APP_NAME}
+DisableDirPage=auto
DefaultGroupName={#APP_NAME}
+DisableProgramGroupPage=auto
DisableReadyPage=yes
InfoBeforeFile=gpl-2.0.rtf
PrivilegesRequired=none
@@ -505,7 +507,7 @@ begin
Parent:=PuTTYPage.Surface;
Caption:=
'PuTTY sessions were found in your Registry. You may specify the path' + #13 +
- 'to an existing copy of (Tortoise)Plink.exe from the TortoiseSVN/CVS' + #13 +
+ 'to an existing copy of (Tortoise)Plink.exe from the TortoiseGit/SVN/CVS' + #13 +
'or PuTTY applications. The GIT_SSH and SVN_SSH environment' + #13 +
'variables will be adjusted to point to the following executable:';
Left:=ScaleX(28);
View
16 share/WinGit/putty.inc.iss
@@ -1,20 +1,26 @@
const
+ TortoiseGitInstallKey='SOFTWARE\TortoiseGit';
TortoiseSVNInstallKey='SOFTWARE\TortoiseSVN';
TortoiseCVSUninstallKey='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\TortoiseCVS_is1';
PuTTYUninstallKey='SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\PuTTY_is1';
PuTTYPrivateKeyAssoc='PuTTYPrivateKey\shell\open\command';
// Tries to detect the path to a PuTTY installation / an application that comes
-// with an improved version of Plink. TortoisePlink from TortoiseSVN features a
+// with an improved version of Plink. TortoisePlink from TortoiseGit/SVN features a
// GUI dialog to accept new host keys, for example.
function GetPuTTYLocation:string;
begin
// Prefer TortoisePlink over vanilla Plink for its GUI dialog to accept host keys.
- if (IsWin64 and RegQueryStringValue(HKEY_LOCAL_MACHINE_64,TortoiseSVNInstallKey,'Directory',Result)) or
- RegQueryStringValue(HKEY_LOCAL_MACHINE_32,TortoiseSVNInstallKey,'Directory',Result) then begin
- // C:\Program Files\TortoiseSVN\
+ if (IsWin64 and RegQueryStringValue(HKEY_LOCAL_MACHINE_64,TortoiseGitInstallKey,'Directory',Result)) or
+ RegQueryStringValue(HKEY_LOCAL_MACHINE_32,TortoiseGitInstallKey,'Directory',Result) then begin
+ // C:\Program Files\TortoiseGit\
Result:=Result+'bin\';
- // C:\Program Files\TortoiseSVN\bin\
+ // C:\Program Files\TortoiseGit\bin\
+ end else if (IsWin64 and RegQueryStringValue(HKEY_LOCAL_MACHINE_64,TortoiseSVNInstallKey,'Directory',Result)) or
+ RegQueryStringValue(HKEY_LOCAL_MACHINE_32,TortoiseSVNInstallKey,'Directory',Result) then begin
+ // C:\Program Files\TortoiseSVN\
+ Result:=Result+'bin\';
+ // C:\Program Files\TortoiseSVN\bin\
end else begin
if not (IsWin64 and RegQueryStringValue(HKEY_LOCAL_MACHINE_64,TortoiseCVSUninstallKey,'InstallLocation',Result)) then begin
RegQueryStringValue(HKEY_LOCAL_MACHINE_32,TortoiseCVSUninstallKey,'InstallLocation',Result);
View
10 share/msysGit/merging-rebase.sh
@@ -68,20 +68,20 @@ fi
HEAD_NAME="$(git rev-parse --symbolic-full-name HEAD)"
case "$HEAD_NAME" in
-refs/heads/devel)
+refs/heads/*)
UPSTREAM=$(git rev-parse --symbolic-full-name HEAD@{u}) || {
echo "Not tracking any remote branch!" >&2
exit 1
}
test "$(git rev-parse HEAD)" = "$(git rev-parse $UPSTREAM)" ||
- test "$(git rev-parse devel@{1})" = "$(git rev-parse $UPSTREAM)" || {
- echo "Your 'devel' is not up-to-date!" >&2
+ test "$(git rev-parse $HEAD_NAME@{1})" = "$(git rev-parse $UPSTREAM)" || {
+ echo "Your '$HEAD_NAME' is not up-to-date!" >&2
exit 1
}
;; # okay
HEAD) ;; # okay
*)
- echo "Not on 'devel'!" >&2
+ echo "Not on any branch!" >&2
exit 1
;;
esac
@@ -167,4 +167,4 @@ EOF
chmod a+x "$TMP_EDITOR"
# Rebase!
-GIT_EDITOR="$TMP_EDITOR" git rebase --autosquash -i $REBASING_BASE
+GIT_EDITOR="$TMP_EDITOR" git rebase --autosquash -i ${REBASING_BASE:-$TO}
View
BIN  share/resources/git.bmp
Binary file not shown
View
BIN  share/resources/git.ico
Binary file not shown
View
74 share/resources/gitlogo.svg
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44.1"
- width="97"
- height="188"
- version="1.0"
- sodipodi:docbase="/home/gene099"
- sodipodi:docname="gitlogo.svg">
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="Git Logo">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs5" />
- <sodipodi:namedview
- inkscape:window-height="632"
- inkscape:window-width="1098"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- guidetolerance="10.0"
- gridtolerance="10.0"
- objecttolerance="10.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base"
- inkscape:zoom="4.0212766"
- inkscape:cx="56.955026"
- inkscape:cy="55.854568"
- inkscape:window-x="174"
- inkscape:window-y="60"
- inkscape:current-layer="svg2"
- showguides="false" />
- <g
- id="g1915"
- transform="translate(-3.915344e-5,-1.587301e-8)">
- <path
- style="fill:none"
- d="M 0,94 C 0,62.666667 0,31.333333 0,0 C 32.333333,0 64.666667,0 97,0 C 97,62.666667 97,125.33333 97,188 C 64.666667,188 32.333333,188 0,188 C 0,156.66667 0,125.33333 0,94 z "
- id="path1919" />
- <path
- style="fill:#666;fill-opacity:1"
- d="M 37.664899,184.58554 C 21.895418,182.55403 5.6661972,167.64367 3.3987193,150.1511 C 1.2240485,135.52701 4.3614628,118.45697 16.450174,108.80568 C 21.75244,105.19169 28.965047,101.14246 35.325463,101.62434 C 35.515961,108.09863 35.134965,115.96793 35.325463,122.44222 C 27.749678,123.28567 20.416427,131.89654 20.569051,139.78073 C 20.754756,150.04074 25.295526,159.46754 35.166718,162.53826 C 46.085307,166.2122 58.583978,165.16727 68.691405,159.05921 C 77.041121,152.55358 77.813587,140.44085 73.446467,131.22303 C 71.482045,126.15057 67.247476,122.42665 61.5,122.44222 L 61.5,140.5 L 45.29359,140.5 L 45.29359,101.62434 L 94.37037,101.62434 L 94.37037,115.60423 L 80.927975,115.72857 C 93.471899,122.87923 94.757645,138.31236 94.114862,149.01935 C 94.566741,167.41218 76.395502,182.4083 58.372879,184.41334 C 51.852471,184.9022 46.335496,184.92793 37.664899,184.58554 z "
- id="path1927"
- sodipodi:nodetypes="ccccccccccccccccccc" />
- <path
- style="fill:#d8382d;fill-opacity:1"
- d="M 2.6030317,93.90175 L 2.5,73.5 L 94.5,73.5 L 94.489423,94 L 2.6030317,93.90175 z "
- id="path1925"
- sodipodi:nodetypes="ccccc" />
- <path
- style="fill:#40bf4c;fill-opacity:1"
- d="M 37.666668,66.333336 L 37.666668,44.5 L 2,44.5 L 2,25.5 L 37.666668,25.5 L 37.666668,1 L 59,1 L 59,25.5 L 94.5,25.5 L 94.5,44.5 L 59,44.5 L 58.648317,66.287772 L 37.666668,66.333336 z "
- id="path1917"
- sodipodi:nodetypes="ccccccccccccc" />
- </g>
-</svg>
View
BIN  share/resources/gitsmall.bmp
Binary file not shown
View
42 src/curl/certs/cacert.class3.pem
@@ -0,0 +1,42 @@
+-----BEGIN CERTIFICATE-----
+MIIHWTCCBUGgAwIBAgIDCkGKMA0GCSqGSIb3DQEBCwUAMHkxEDAOBgNVBAoTB1Jv
+b3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAGA1UEAxMZ
+Q0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYSc3VwcG9y
+dEBjYWNlcnQub3JnMB4XDTExMDUyMzE3NDgwMloXDTIxMDUyMDE3NDgwMlowVDEU
+MBIGA1UEChMLQ0FjZXJ0IEluYy4xHjAcBgNVBAsTFWh0dHA6Ly93d3cuQ0FjZXJ0
+Lm9yZzEcMBoGA1UEAxMTQ0FjZXJ0IENsYXNzIDMgUm9vdDCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAKtJNRFIfNImflOUz0Op3SjXQiqL84d4GVh8D57a
+iX3h++tykA10oZZkq5+gJJlz2uJVdscXe/UErEa4w75/ZI0QbCTzYZzA8pD6Ueb1
+aQFjww9W4kpCz+JEjCUoqMV5CX1GuYrz6fM0KQhF5Byfy5QEHIGoFLOYZcRD7E6C
+jQnRvapbjZLQ7N6QxX8KwuPr5jFaXnQ+lzNZ6MMDPWAzv/fRb0fEze5ig1JuLgia
+pNkVGJGmhZJHsK5I6223IeyFGmhyNav/8BBdwPSUp2rVO5J+TJAFfpPBLIukjmJ0
+FXFuC3ED6q8VOJrU0gVyb4z5K+taciX5OUbjchs+BMNkJyIQKopPWKcDrb60LhPt
+XapI19V91Cp7XPpGBFDkzA5CW4zt2/LP/JaT4NsRNlRiNDiPDGCbO5dWOK3z0luL
+oFvqTpa4fNfVoIZwQNORKbeiPK31jLvPGpKK5DR7wNhsX+kKwsOnIJpa3yxdUly6
+R9Wb7yQocDggL9V/KcCyQQNokszgnMyXS0XvOhAKq3A6mJVwrTWx6oUrpByAITGp
+rmB6gCZIALgBwJNjVSKRPFbnr9s6JfOPMVTqJouBWfmh0VMRxXudA/Z0EeBtsSw/
+LIaRmXGapneLNGDRFLQsrJ2vjBDTn8Rq+G8T/HNZ92ZCdB6K4/jc0m+YnMtHmJVA
+BfvpAgMBAAGjggINMIICCTAdBgNVHQ4EFgQUdahxYEyIE/B42Yl3tW3Fid+8sXow
+gaMGA1UdIwSBmzCBmIAUFrUyG9TH8+DmjvO90rA67rI5GNGhfaR7MHkxEDAOBgNV
+BAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEiMCAG
+A1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJARYS
+c3VwcG9ydEBjYWNlcnQub3JnggEAMA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUH
+AQEEUTBPMCMGCCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggr
+BgEFBQcwAoYcaHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBB
+MD8GCCsGAQQBgZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9y
+Zy9pbmRleC5waHA/aWQ9MTAwNAYJYIZIAYb4QgEIBCcWJWh0dHA6Ly93d3cuQ0Fj
+ZXJ0Lm9yZy9pbmRleC5waHA/aWQ9MTAwUAYJYIZIAYb4QgENBEMWQVRvIGdldCB5
+b3VyIG93biBjZXJ0aWZpY2F0ZSBmb3IgRlJFRSwgZ28gdG8gaHR0cDovL3d3dy5D
+QWNlcnQub3JnMA0GCSqGSIb3DQEBCwUAA4ICAQApKIWuRKm5r6R5E/CooyuXYPNc
+7uMvwfbiZqARrjY3OnYVBFPqQvX56sAV2KaC2eRhrnILKVyQQ+hBsuF32wITRHhH
+Va9Y/MyY9kW50SD42CEH/m2qc9SzxgfpCYXMO/K2viwcJdVxjDm1Luq+GIG6sJO4
+D+Pm1yaMMVpyA4RS5qb1MyJFCsgLDYq4Nm+QCaGrvdfVTi5xotSu+qdUK+s1jVq3
+VIgv7nSf7UgWyg1I0JTTrKSi9iTfkuO960NAkW4cGI5WtIIS86mTn9S8nK2cde5a
+lxuV53QtHA+wLJef+6kzOXrnAzqSjiL2jA3k2X4Ndhj3AfnvlpaiVXPAPHG0HRpW
+Q7fDCo1y/OIQCQtBzoyUoPkD/XFzS4pXM+WOdH4VAQDmzEoc53+VGS3FpQyLu7Xt
+hbNc09+4ufLKxw0BFKxwWMWMjTPUnWajGlCVI/xI4AZDEtnNp4Y5LzZyo4AQ5OHz
+0ctbGsDkgJp8E3MGT9ujayQKurMcvEp4u+XjdTilSKeiHq921F73OIZWWonO1sOn
+ebJSoMbxhbQljPI/lrMQ2Y1sVzufb4Y6GIIiNsiwkTjbKqGTqoQ/9SdlrnPVyNXT
+d+pLncdBu8fA46A/5H2kjXPmEkvfoXNzczqA6NXLji/L6hOn1kGLrPo8idck9U60
+4GGSt/M3mMS+lqO3ig==
+-----END CERTIFICATE-----
View
41 src/curl/certs/cacert.root.pem
@@ -0,0 +1,41 @@
+-----BEGIN CERTIFICATE-----
+MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
+IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
+IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
+Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
+BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
+MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
+ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
+8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
+zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
+fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
+w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
+G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
+epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
+laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
+QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
+fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
+YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
+ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
+gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
+MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
+IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
+dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
+czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
+dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
+aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
+AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
+b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
+ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
+nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
+18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
+gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
+Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
+sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
+SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
+CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
+GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
+zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
+omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
+-----END CERTIFICATE-----
View
4 src/git-wrapper/.gitignore
@@ -0,0 +1,4 @@
+*.exe
+*.o
+*~
+
View
16 src/git-wrapper/Makefile
@@ -0,0 +1,16 @@
+CC = gcc
+CFLAGS = -Wall -Wwrite-strings
+LD = gcc
+LDFLAGS = -Wall -s
+LIBS =-lshell32 -lshlwapi
+
+all: git-wrapper
+
+git-wrapper: git-wrapper.o
+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+clean:
+ -rm -f git-wrapper.o git-wrapper.exe
+
+%.o: %.c
+ $(CC) $(CFLAGS) -c $^ -o $@
View
199 src/git-wrapper/git-wrapper.c
@@ -0,0 +1,199 @@
+/*
+ * git-wrapper - replace cmd\git.cmd with an executable
+ *
+ * Copyright (C) 2012 Pat Thoyts <patthoyts@users.sourceforge.net>
+ */
+
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+#define UNICODE
+#define _UNICODE
+#include <windows.h>
+#include <shlwapi.h>
+#include <shellapi.h>
+#include <stdio.h>
+
+static void
+PrintError(LPCWSTR wszPrefix, DWORD dwError)
+{
+ LPWSTR lpsz = NULL;
+ DWORD cch = 0;
+
+ cch = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER
+ | FORMAT_MESSAGE_FROM_SYSTEM
+ | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL, dwError, LANG_NEUTRAL,
+ (LPTSTR)&lpsz, 0, NULL);
+ if (cch < 1) {
+ cch = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER
+ | FORMAT_MESSAGE_FROM_STRING
+ | FORMAT_MESSAGE_ARGUMENT_ARRAY,
+ L"Code 0x%1!08x!",
+ 0, LANG_NEUTRAL, (LPTSTR)&lpsz, 0,
+ (va_list*)&dwError);
+ }
+ fwprintf(stderr, L"%s: %s", wszPrefix, lpsz);
+ LocalFree((HLOCAL)lpsz);
+}
+
+int
+main(void)
+{
+ int r = 1, wait = 1;
+ WCHAR exepath[MAX_PATH], exe[MAX_PATH];
+ LPWSTR cmd = NULL, path2 = NULL, exep = exe;
+ UINT codepage = 0;
+ int len;
+
+ /* get the installation location */
+ GetModuleFileName(NULL, exepath, MAX_PATH);
+ PathRemoveFileSpec(exepath);
+ PathRemoveFileSpec(exepath);
+
+ /* set the default exe module */
+ wcscpy(exe, exepath);
+ PathAppend(exe, L"bin\\git.exe");
+
+ /* if not set, set TERM to msys */
+ if (GetEnvironmentVariable(L"TERM", NULL, 0) == 0) {
+ SetEnvironmentVariable(L"TERM", L"msys");
+ }
+
+ /* if not set, set PLINK_PROTOCOL to ssh */
+ if (GetEnvironmentVariable(L"PLINK_PROTOCOL", NULL, 0) == 0) {
+ SetEnvironmentVariable(L"PLINK_PROTOCOL", L"ssh");
+ }
+
+ /* set HOME to %HOMEDRIVE%%HOMEPATH% or %USERPROFILE%
+ * With roaming profiles: HOMEPATH is the roaming location and
+ * USERPROFILE is the local location
+ */
+ if (GetEnvironmentVariable(L"HOME", NULL, 0) == 0) {
+ LPWSTR e = NULL;
+ len = GetEnvironmentVariable(L"HOMEPATH", NULL, 0);
+ if (len == 0) {
+ len = GetEnvironmentVariable(L"USERPROFILE", NULL, 0);
+ if (len != 0) {
+ e = (LPWSTR)malloc(len * sizeof(WCHAR));
+ GetEnvironmentVariable(L"USERPROFILE", e, len);
+ SetEnvironmentVariable(L"HOME", e);
+ free(e);
+ }
+ } else {
+ int n;
+ len += GetEnvironmentVariable(L"HOMEDRIVE", NULL, 0);
+ e = (LPWSTR)malloc(sizeof(WCHAR) * (len + 2));
+ n = GetEnvironmentVariable(L"HOMEDRIVE", e, len);
+ GetEnvironmentVariable(L"HOMEPATH", &e[n], len-n);
+ SetEnvironmentVariable(L"HOME", e);
+ free(e);
+ }
+ }
+
+ /* extend the PATH */
+ len = GetEnvironmentVariable(L"PATH", NULL, 0);
+ len = sizeof(WCHAR) * (len + 2 * MAX_PATH);
+ path2 = (LPWSTR)malloc(len);
+ wcscpy(path2, exepath);
+ PathAppend(path2, L"bin;");
+ /* should do this only if it exists */
+ wcscat(path2, exepath);
+ PathAppend(path2, L"mingw\\bin;");
+ GetEnvironmentVariable(L"PATH", &path2[wcslen(path2)],
+ (len/sizeof(WCHAR))-wcslen(path2));
+ SetEnvironmentVariable(L"PATH", path2);
+ free(path2);
+
+
+ /* fix up the command line to call git.exe
+ * We have to be very careful about quoting here so we just
+ * trim off the first argument and replace it leaving the rest
+ * untouched.
+ */
+ {
+ int wargc = 0, gui = 0;
+ LPWSTR cmdline = NULL;
+ LPWSTR *wargv = NULL, p = NULL;
+ cmdline = GetCommandLine();
+ wargv = CommandLineToArgvW(cmdline, &wargc);
+ cmd = (LPWSTR)malloc(sizeof(WCHAR) * (wcslen(cmdline) + MAX_PATH));
+ if (wargc > 1 && wcsicmp(L"gui", wargv[1]) == 0) {
+ wait = 0;
+ if (wargc > 2 && wcsicmp(L"citool", wargv[2]) == 0) {
+ wait = 1;
+ wcscpy(cmd, L"git.exe");
+ } else {
+ WCHAR script[MAX_PATH];
+ gui = 1;
+ wcscpy(script, exepath);
+ PathAppend(script, L"libexec\\git-core\\git-gui");
+ PathQuoteSpaces(script);
+ wcscpy(cmd, L"wish.exe ");
+ wcscat(cmd, script);
+ wcscat(cmd, L" --");
+ exep = NULL; /* find the module from the commandline */
+ }
+ } else {
+ wcscpy(cmd, L"git.exe");
+ }
+ /* find the first space after the initial parameter then append all */
+ p = wcschr(&cmdline[wcslen(wargv[0])], L' ');
+ if (p && *p) {
+ /* for git gui subcommands, remove the 'gui' word */
+ if (gui) {
+ while (*p == L' ') ++p;
+ p = wcschr(p, L' ');
+ }
+ if (p && *p)
+ wcscat(cmd, p);
+ }
+ LocalFree(wargv);
+ }
+
+ /* set the console to ANSI/GUI codepage */
+ codepage = GetConsoleCP();
+ SetConsoleCP(GetACP());
+
+ {
+ STARTUPINFO si;
+ PROCESS_INFORMATION pi;
+ BOOL br = FALSE;
+ ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
+ ZeroMemory(&si, sizeof(STARTUPINFO));
+ si.cb = sizeof(STARTUPINFO);
+ br = CreateProcess(exep,/* module: null means use command line */
+ cmd, /* modified command line */
+ NULL, /* process handle inheritance */
+ NULL, /* thread handle inheritance */
+ TRUE, /* handles inheritable? */
+ CREATE_UNICODE_ENVIRONMENT,
+ NULL, /* environment: use parent */
+ NULL, /* starting directory: use parent */
+ &si, &pi);
+ if (br) {
+ if (wait)
+ WaitForSingleObject(pi.hProcess, INFINITE);
+ if (!GetExitCodeProcess(pi.hProcess, (DWORD *)&r))
+ PrintError(L"error reading exit code", GetLastError());
+ CloseHandle(pi.hProcess);
+ } else {
+ PrintError(L"error launching git", GetLastError());
+ r = 1;
+ }
+ }
+
+ free(cmd);
+
+ /* reset the console codepage */
+ SetConsoleCP(codepage);
+ ExitProcess(r);
+}
+
+/*
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: nil
+ * c-basic-offset: 4
+ * tab-width: 4
+ * End:
+ */
View
21 src/git-wrapper/release.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+cd "$(dirname "$0")"
+
+DEST=/cmd/git.exe
+
+die () {
+ echo "$*" >&2
+ exit 1
+}
+
+rmscript () {
+ test -f /cmd/git.cmd && rm /cmd/git.cmd || true
+}
+
+make &&
+index=$(/share/msysGit/pre-install.sh) &&
+rmscript &&
+install -m 775 git-wrapper.exe $DEST &&
+/share/msysGit/post-install.sh $index "Updated git wrapper exe" ||
+die "Failed to update git wrapper executable"
Please sign in to comment.
Something went wrong with that request. Please try again.