From: Pat Thoyts Date: Sun, 2 Jun 2013 10:20:37 +0000 (+0100) Subject: Updated to Git v1.8.3 X-Git-Url: https://repo.or.cz/w/msysgit.git/commitdiff_plain/84fe43e487aa58c7062aacbdd636eb5c7666699e Updated to Git v1.8.3 Signed-off-by: Pat Thoyts --- diff --git a/doc/git/html b/doc/git/html index 9b2005af..b6595471 160000 --- a/doc/git/html +++ b/doc/git/html @@ -1 +1 @@ -Subproject commit 9b2005af4880f583b2ce605c988b96dbee290503 +Subproject commit b6595471f5299e8b13181e09072b486dd0ad6261 diff --git a/git b/git index 694fb724..74f23e7d 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 694fb7247b0bb3a3f9810f1350f997ebdb6008ae +Subproject commit 74f23e7da60786e14fb1da2af765cd95c7095ed5 diff --git a/share/WinGit/ReleaseNotes.rtf b/share/WinGit/ReleaseNotes.rtf index 0ffeab9b..bc090cff 100644 --- a/share/WinGit/ReleaseNotes.rtf +++ b/share/WinGit/ReleaseNotes.rtf @@ -1,7 +1,8 @@ -{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\fnil\fcharset0 Arial;}{\f2\fnil\fcharset2 Symbol;}} +{\rtf1\ansi\ansicpg1252\deff0\nouicompat{\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.8.1.2-preview20130201)\b0\fs20\par -Last update: 1 February 2013\par +{\*\generator Riched20 6.2.9200}\viewkind4\uc1 +\pard\cf1\b\f0\fs32\lang1033 Git Release Notes (Git-1.8.3-preview20130601)\b0\fs20\par +Last update: 1 June 2013\par \par \b\fs24 Introduction\b0\fs20\par \par @@ -9,72 +10,107 @@ These release notes describe issues specific to the Git for Windows release.\par \par General release notes covering the history of the core git commands are included in the subdirectory doc/git/html of the installation directory. Look for files starting with RelNotes.\par \par -See \cf0{\field{\*\fldinst{HYPERLINK "http://git-scm.com/"}}{\fldrslt{\ul\cf2 http://git-scm.com/}}}\cf1\f0\fs20 for further details about Git including ports to other operating systems. Git for Windows is hosted at \cf0{\field{\*\fldinst{HYPERLINK "http://msysgit.github.com/"}}{\fldrslt{\ul\cf2 http://msysgit.github.com/}}}\cf1\f0\fs20 .\par +See {\cf0{\field{\*\fldinst{HYPERLINK http://git-scm.com/ }}{\fldrslt{http://git-scm.com/\ul0\cf0}}}}\f0\fs20 for further details about Git including ports to other operating systems. Git for Windows is hosted at {\cf0{\field{\*\fldinst{HYPERLINK http://msysgit.github.com/ }}{\fldrslt{http://msysgit.github.com/\ul0\cf0}}}}\f0\fs20 .\par \par \b\fs24 Known issues\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\fs20 Some commands are not yet supported on Windows and excluded from the installation; namely: git archimport, git cvsexportcommit, git cvsimport, git cvsserver, git instaweb, git shell.\par {\pntext\f2\'B7\tab}As Git for Windows is build without Python support, also all commands that require Python are not yet supported; namely: git p4, git remote-hg, git remote-testgit.\par -{\pntext\f2\'B7\tab}The Logitec QuickCam software can cause spurious crashes. See "Why does make often crash creating a sh.exe.stackdump file when I try to compile my source code?" on the MinGW Wiki (\cf0{\field{\*\fldinst{HYPERLINK "http://www.mingw.org/wiki/Environment_issues"}}{\fldrslt{\ul\cf2 http://www.mingw.org/wiki/Environment_issues}}}\cf1\f0\fs20 )\par +{\pntext\f2\'B7\tab}The Logitec QuickCam software can cause spurious crashes. See "Why does make often crash creating a sh.exe.stackdump file when I try to compile my source code?" on the MinGW Wiki ({\cf0{\field{\*\fldinst{HYPERLINK http://www.mingw.org/wiki/Environment_issues }}{\fldrslt{http://www.mingw.org/wiki/Environment_issues\ul0\cf0}}}}\f0\fs20 )\par {\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}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}Web transport using IPv6 does not work. Using ssh with putty over IPv6 is fine.\par -\pard\li144 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 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\li144 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 Should you encounter other problems, please search the mailing list first ({\cf0{\field{\*\fldinst{HYPERLINK http://groups.google.com/group/msysgit }}{\fldrslt{http://groups.google.com/group/msysgit\ul0\cf0}}}}\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 +\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{https://www.cacert.org/policy/RootDistributionLicense.php\ul0\cf0}}}}\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.8.1.2-preview20130201\par +\i\fs20\par +New Features\par + +\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with Git 1.8.3 plus Windows specific patches.\par +{\pntext\f2\'B7\tab}Updated curl to 7.30.0 with IPv6 support enabled.\par +{\pntext\f2\'B7\tab}Updated gnupg to 1.4.13\par +{\pntext\f2\'B7\tab}Installer improvements for update or reinstall options.\par + +\pard\par +\b\i Bugfixes\par + +\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Avoid emitting color coded ls output to pipes.\par +{\pntext\f2\'B7\tab}ccache binary updated to work on XP.\par +{\pntext\f2\'B7\tab}Fixed association of .sh files setup by the installer.\par +{\pntext\f2\'B7\tab}Fixed registry-based explorer menu items for XP (#95)\par + +\pard\b\fs24\par Changes since Git-1.8.0-preview20121022\par \i\fs20\par New Features\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with Git 1.8.1.2 plus Windows specific patches.\par {\pntext\f2\'B7\tab}Includes support for using the Windows Credential API to store access credentials securely and provide access via the control panel tool to manage git credentials.\par -{\pntext\f2\'B7\tab}Rebase autosquash support is now enabled by default. See \cf0{\field{\*\fldinst{HYPERLINK "http://goo.gl/2kwKJ"}}{\fldrslt{\ul\cf2 http://goo.gl/2kwKJ}}}\cf1\f0\fs20 for some suggestions on using this.\par +{\pntext\f2\'B7\tab}Rebase autosquash support is now enabled by default. See {\cf0{\field{\*\fldinst{HYPERLINK http://goo.gl/2kwKJ }}{\fldrslt{http://goo.gl/2kwKJ\ul0\cf0}}}}\f0\fs20 for some suggestions on using this.\par {\pntext\f2\'B7\tab}All msysGit development is now done on 'master' and the devel branches are deleted.\par {\pntext\f2\'B7\tab}Tcl/Tk upgraded to 8.5.13.\par {\pntext\f2\'B7\tab}InnoSetup updated to 5.5.3 (Unicode)\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Some changes to avoid clashing with cygwin quite so often.\par {\pntext\f2\'B7\tab}The installer will attempt to handle files mirrored in the virtualstore.\par + \pard\b\fs24\par Changes since Git-1.7.11-preview20120710\par \i\fs20\par New Features\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with Git 1.8.0 plus Windows specific patches.\par {\pntext\f2\'B7\tab}InnoSetup updated to 5.5.2\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Fixed icon backgrounds on low color systems\par {\pntext\f2\'B7\tab}Avoid installer warnings during writability testing.\par {\pntext\f2\'B7\tab}Fix bash prompt handling due to upstream changes.\par + \pard\b\fs24\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 + +\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{http://git-scm.com/downloads/logos\ul0\cf0}}}}\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 + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with Git 1.7.11 plus Windows specific patches.\par {\pntext\f2\'B7\tab}Updated curl to 7.26.0\par {\pntext\f2\'B7\tab}Updated zlib to 1.2.7\par @@ -82,20 +118,26 @@ Changes since Git-1.7.10-preview20120409\par {\pntext\f2\'B7\tab}Updated openssl to 0.9.8x and support reading certificate files from Unicode paths (issue #24)\par {\pntext\f2\'B7\tab}Version resource built into git executables.\par {\pntext\f2\'B7\tab}Support the Large Address Aware feature to reduce chance out-of-memory on 64 bit windows when repacking large repositories.\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.11.\par {\pntext\f2\'B7\tab}Fix backspace/delete key handling in rxvt terminals.\par {\pntext\f2\'B7\tab}Fixed TERM setting to avoid a warning from less.\par {\pntext\f2\'B7\tab}Various fixes for handling unicode paths.\par + \pard\b\fs24\par Changes since Git-1.7.9-preview20120201\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 Git 1.7.10 plus Windows specific patches.\par {\pntext\f2\'B7\tab}UTF-8 file name support.\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.10.\par {\pntext\f2\'B7\tab}Clarifications in the installer.\par {\pntext\f2\'B7\tab}Console output is now even thread-safer.\par @@ -103,110 +145,151 @@ Bugfixes\par {\pntext\f2\'B7\tab}Git Cheetah no longer writes big log files directly to C:\\.\par {\pntext\f2\'B7\tab}Development environment: enhancements in the script to make a 64-bit setup.\par {\pntext\f2\'B7\tab}Development environment: enhancements to the 64-bit Cheetah build.\par + \pard\b\fs24\par Changes since Git-1.7.8-preview20111206\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 Git 1.7.9 plus Windows specific patches.\par {\pntext\f2\'B7\tab}Improvements to the installer running application detection.\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.9\par {\pntext\f2\'B7\tab}Fixed initialization of the git-cheetah submodule in net-installer.\par {\pntext\f2\'B7\tab}Fixed duplicated context menu items with git-cheetah on Windows 7.\par {\pntext\f2\'B7\tab}Patched gitk to display filenames when run on a subdirectory.\par {\pntext\f2\'B7\tab}Tabbed gitk preferences dialog to allow use on smaller screens.\par + \pard\b\fs24\par Changes since Git-1.7.7.1-preview20111027\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 Git 1.7.8 plus Windows specific patches.\par {\pntext\f2\'B7\tab}Updated Tcl/Tk to 8.5.11 and libiconv to 1.14\par {\pntext\f2\'B7\tab}Some changes to support building with MSVC compiler.\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.8\par {\pntext\f2\'B7\tab}Git documentation submodule location fixed.\par + \pard\b\fs24\par Changes since Git-1.7.7-preview20111014\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 Git 1.7.7.1 plus patches.\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.7.1\par {\pntext\f2\'B7\tab}Includes an important upstream fix for a bug that sometimes corrupts the git index file.\par + \pard\b\fs24\par Changes since Git-1.7.6-preview20110708\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 Git 1.7.7 plus patches.\par {\pntext\f2\'B7\tab}Updated gzip/gunzip and include unzip and gvim\par -{\pntext\f2\'B7\tab}Primary repositories moved to github.com at \cf0{\field{\*\fldinst{HYPERLINK "http://github.com/msysgit/"}}{\fldrslt{\ul\cf2 http://github.com/msysgit/}}}\cf1\f0\fs20\par +{\pntext\f2\'B7\tab}Primary repositories moved to github.com at {\cf0{\field{\*\fldinst{HYPERLINK http://github.com/msysgit/ }}{\fldrslt{http://github.com/msysgit/\ul0\cf0}}}}\f0\fs20\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.7\par {\pntext\f2\'B7\tab}Re-enable vim highlighting\par {\pntext\f2\'B7\tab}Fixed issue with libiconv/libiconv-2 location\par {\pntext\f2\'B7\tab}Fixed regressions in Git Bash script\par {\pntext\f2\'B7\tab}Fixed installation of mergetools for difftool and mergetool use and launching of beyond compare on windows.\par {\pntext\f2\'B7\tab}Fixed warning about mising hostname during git fetch\par + \pard\b\fs24\par Changes since Git-1.7.4-preview20110211\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 Git 1.7.6 plus patches.\par {\pntext\f2\'B7\tab}Updates to various supporting tools (openssl, iconv, InnoSetup)\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.6\par {\pntext\f2\'B7\tab}Fixes to msys compat layer for directory entry handling and command line globbing.\par + \pard\b\fs24\par Changes since Git-1.7.3.2-preview20101025\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 Git 1.7.4 plus patches.\par {\pntext\f2\'B7\tab}Includes antiword to enable viewing diffs of .doc files\par {\pntext\f2\'B7\tab}Includes poppler to enable viewing diffs of .pdf files\par {\pntext\f2\'B7\tab}Removes cygwin paths from the bash shell PATH\par + \pard\b\i\par Bugfixes\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.4\par + \pard\b\fs24\par Changes since Git-1.7.3.1-preview20101002\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 Git 1.7.3.2 plus patches.\par + \pard\par \b\fs24 Changes since Git-1.7.2.3-preview20100911\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 Git 1.7.3.1 plus patches.\par {\pntext\f2\'B7\tab}Updated to Vim 7.3, file-5.04 and InnoSetup 5.3.11\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 Issue 528 (remove uninstaller from Start Menu) was fixed\par {\pntext\f2\'B7\tab}Issue 527 (failing to find the certificate authority bundle) was fixed\par {\pntext\f2\'B7\tab}Issue 524 (remove broken and unused sdl-config file) was fixed\par {\pntext\f2\'B7\tab}Issue 523 (crash pushing to WebDAV remote) was fixed\par + \pard\b\fs24\par Changes since Git-1.7.1-preview20100612\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 Git 1.7.2.3 plus patches.\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 Issue 519 (build problem with compat/regex/regexec.c) was fixed\par {\pntext\f2\'B7\tab}Issue 430 (size of panes not preserved in git-gui) was fixed\par {\pntext\f2\'B7\tab}Issue 411 (git init failing to work with CIFS paths) was fixed\par {\pntext\f2\'B7\tab}Issue 501 (failing to clone repo from root dir using relative path) was fixed\par + \pard\b\fs24\par Changes since Git-1.7.0.2-preview20100309\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 Git 1.7.1 plus patches.\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 Issue 27 (git-send-mail not working properly) was fixed again\par {\pntext\f2\'B7\tab}Issue 433 (error while running git svn fetch) was fixed\par {\pntext\f2\'B7\tab}Issue 427 (Gitk reports error: "couldn't compile regular expression pattern: invalid repetition count(s)") was fixed\par @@ -226,10 +309,12 @@ Changes since Git-1.7.0.2-preview20100309\par {\pntext\f2\'B7\tab}Issue 436 ("mkdir : No such file or directory" error while using git-svn to fetch or rebase) was fixed\par {\pntext\f2\'B7\tab}Issue 440 (Uninstall does not remove cheetah.) was fixed\par {\pntext\f2\'B7\tab}Issue 441 (Git-1.7.0.2-preview20100309.exe installer fails with unwritable msys-1.0.dll when ssh-agent is running) was fixed\par + \pard\b\fs24\par Changes since Git-1.6.5.1-preview20091022\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.7.0.2.\par {\pntext\f2\'B7\tab}Comes with Git-Cheetah (on 32-bit Windows only, for now).\par {\pntext\f2\'B7\tab}Comes with connect.exe, a SOCKS proxy.\par @@ -238,8 +323,11 @@ Changes since Git-1.6.5.1-preview20091022\par {\pntext\f2\'B7\tab}Features Hany's dos2unix tool, thanks to Sebastian Schuberth.\par {\pntext\f2\'B7\tab}Updated Tcl/Tk to version 8.5.8 (thanks Pat Thoyts!).\par {\pntext\f2\'B7\tab}By default, only .git/ is hidden, to work around a bug in Eclipse (thanks to Erik Faye-Lund).\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 Fixed threaded grep (thanks to Heiko Voigt).\par {\pntext\f2\'B7\tab}git gui was fixed for all kinds of worktree-related failures (thanks Pat Thoyts).\par {\pntext\f2\'B7\tab}git gui now fully supports themed widgets (thanks Pat Thoyts and Heiko Voigt).\par @@ -260,10 +348,12 @@ Changes since Git-1.6.5.1-preview20091022\par {\pntext\f2\'B7\tab}Updated tar to handle the pax headers generated by \i git archive\i0 .\par {\pntext\f2\'B7\tab}Updated sed to a version that can handle the filter-branch examples.\par {\pntext\f2\'B7\tab}.git* files can be associated with the default text editor (issue 397).\par + \pard\b\fs24\par Changes since Git-1.6.4-preview20090729\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.6.5.1.\par {\pntext\f2\'B7\tab}Thanks to Johan 't Hart, files and directories starting with a single dot (such as '.git') will now be marked hidden (you can disable this setting with core.hideDotFiles=false in your config) (Issue 288).\par {\pntext\f2\'B7\tab}Thanks to Thorvald Natvig, Git on Windows can simulate symbolic links by using reparse points when available. For technical reasons, this only works for symbolic links pointing to files, not directories.\par @@ -271,29 +361,42 @@ Changes since Git-1.6.4-preview20090729\par {\pntext\f2\'B7\tab}Thanks to Sebastian Schuberth, we only offer the (Tortoise)Plink option in the installer if the presence of Plink was detected \ul and\ulnone at least one Putty session was found..\par {\pntext\f2\'B7\tab}Thanks to Sebastian Schuberth, the installer has a nicer icon now.\par {\pntext\f2\'B7\tab}Some more work by Sebastian Schuberth was done on better integration of Plink (Issues 305 & 319).\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 Thanks to Sebastian Schuberth, \i git svn\i0 picks up the SSH setting specified with the installer (Issue 305).\par + \pard\b\fs24\par Changes since Git-1.6.3.2-preview20090608\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.6.4.\par -{\pntext\f2\'B7\tab}Supports \cf0{\field{\*\fldinst{HYPERLINK "https://"}}{\fldrslt{\ul\cf2 https://}}}\cf1\f0\fs20 URLs, thanks to Erik Faye-Lund.\par +{\pntext\f2\'B7\tab}Supports \cf0 https://\cf1 URLs, thanks to Erik Faye-Lund.\par {\pntext\f2\'B7\tab}Supports send-email, thanks to Erik Faye-Lund (Issue 27).\par {\pntext\f2\'B7\tab}Updated Tcl/Tk to version 8.5.7, thanks to Pat Thoyts.\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 The home directory is now discovered properly (Issues 108 & 259).\par {\pntext\f2\'B7\tab}IPv6 is supported now, thanks to Martin Martin Storsj\cf0\f1\'f6 (Issue 182).\cf1\f0\par + \pard\b\fs24\par Changes since Git-1.6.3-preview20090507\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.6.3.2.\par {\pntext\f2\'B7\tab}Uses TortoisePlink instead of Plink if available.\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 Plink errors out rather than hanging when the user needs to accept a host key first (Issue 96).\par {\pntext\f2\'B7\tab}The user home directory is inferred from $HOMEDRIVE\\$HOMEPATH instead of $HOME (Issue 108).\par {\pntext\f2\'B7\tab}The environment setting $CYGWIN=tty is ignored (Issues 138, 248 and 251).\par @@ -303,16 +406,21 @@ Changes since Git-1.6.3-preview20090507\par {\pntext\f2\'B7\tab}Completion is case-insensitive again (Issue 256).\par {\pntext\f2\'B7\tab}The "start" command can handle arguments with spaces now (Issue 258).\par {\pntext\f2\'B7\tab}For some Git commands (such as "git commit"), vi no longer "restores" the cursor position.\par + \pard\b\fs24\par Changes since Git-1.6.2.2-preview20090408\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.6.3.\par {\pntext\f2\'B7\tab}Thanks to Marius Storm-Olsen, Git has a substantially faster readdir() implementation now.\par {\pntext\f2\'B7\tab}Marius Storm-Olsen also contributed a patch to include nedmalloc, again speeding up Git noticably.\par {\pntext\f2\'B7\tab}Compiled with GCC 4.4.0\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 Portable Git contains a README.portable.\par {\pntext\f2\'B7\tab}Portable Git now actually includes the builtins.\par {\pntext\f2\'B7\tab}Portable Git includes git-cmd.bat and git-bash.bat.\par @@ -323,31 +431,41 @@ Changes since Git-1.6.2.2-preview20090408\par {\pntext\f2\'B7\tab}gitk tries not to crash when it is closed while reading references (Issue 125, thanks Pat Thoyts).\par {\pntext\f2\'B7\tab}In some setups, hard-linking is not as reliable as it should be, so we have a workaround which avoids hard links in some situations (Issues 222 and 229).\par {\pntext\f2\'B7\tab}git-svn sets core.autocrlf to false now, hopefully shutting up most of the git-svn reports.\par + \pard\b\fs24\par Changes since Git-1.6.2.1-preview20090322\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.6.2.2.\par {\pntext\f2\'B7\tab}Upgraded Tcl/Tk to 8.5.5.\par {\pntext\f2\'B7\tab}TortoiseMerge is supported by mergetool now.\par {\pntext\f2\'B7\tab}Uses pthreads (faster garbage collection on multi-core machines).\par {\pntext\f2\'B7\tab}The test suite passes!\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 Renaming was made more robust (due to Explorer or some virus scanners, files could not be renamed at the first try, so we have to try multiple times).\par {\pntext\f2\'B7\tab}Johannes Sixt made \ul lots\ulnone of changes to the test-suite to identify properly which tests should pass, and which ones cannot pass due to limitations of the platform.\par {\pntext\f2\'B7\tab}Support PAGERs with spaces in their filename.\par {\pntext\f2\'B7\tab}Quite a few changes were undone which we needed in the olden days of msysGit.\par {\pntext\f2\'B7\tab}Fall back to / when HOME cannot be set to the real home directory due to locale issues (works around Issue 108 for the moment).\par + \pard\b\fs24\par Changes since Git-1.6.2-preview20090308\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.6.2.1.\par {\pntext\f2\'B7\tab}A portable application is shipped in addition to the installer (Issue 195).\par {\pntext\f2\'B7\tab}Comes with a Windows-specific mmap() implementation (Issue 198).\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 ANSI control characters are no longer shown verbatim (Issue 124).\par {\pntext\f2\'B7\tab}Temporary files are created respecting core.autocrlf (Issue 177).\par {\pntext\f2\'B7\tab}The Git Bash prompt is colorful again (Issue 199).\par @@ -355,126 +473,173 @@ Changes since Git-1.6.2-preview20090308\par {\pntext\f2\'B7\tab}An infinite loop was fixed in git-gui (Issue 205).\par {\pntext\f2\'B7\tab}The ssh protocol is always used with plink.exe (Issue 209).\par {\pntext\f2\'B7\tab}More vim files are shipped now, so that syntax highlighting works.\par + \pard\b\fs24\par Changes since Git-1.6.1-preview20081225\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.6.2.\par {\pntext\f2\'B7\tab}Comes with upgraded vim 7.2.\par {\pntext\f2\'B7\tab}Compiled with GCC 4.3.3.\par {\pntext\f2\'B7\tab}The user can choose the preferred CR/LF behavior in the installer now.\par {\pntext\f2\'B7\tab}Peter Kodl contributed support for hardlinks on Windows.\par {\pntext\f2\'B7\tab}The bash prompt shows information about the current repository.\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 If supported by the file system, pack files can grow larger than 2gb.\par {\pntext\f2\'B7\tab}Comes with updated msys-1.0.dll (should fix some Vista issues).\par {\pntext\f2\'B7\tab}Assorted fixes to support the new libexec/git-core/ layout better.\par {\pntext\f2\'B7\tab}Read-only files can be properly replaced now.\par {\pntext\f2\'B7\tab}git-svn is included again (original caveats still apply).\par {\pntext\f2\'B7\tab}Obsolete programs from previous installations are cleaned up.\par + \pard\li144\par + \pard\b\fs24 Changes since Git-1.6.0.2-preview20080923\par \i\fs20\par New Features\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with official git 1.6.1.\par {\pntext\f2\'B7\tab}Avoid useless console windows.\par {\pntext\f2\'B7\tab}Installer remembers how to handle PATH. \par + \pard\b\fs24\par Changes since Git-1.6.0.2-preview20080921\par \i\fs20\par Bugfixes\b0\i0\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432 ssh works again.\par {\pntext\f2\'B7\tab}'git add -p' works again.\par {\pntext\f2\'B7\tab}Various programs that aborted with 'Assertion failed: argv0_path' are fixed.\par + \pard\b\fs24\par Changes since Git-1.5.6.1-preview20080701\par \i\fs20\par Removed Features\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 git svn is excluded from the end-user installer (see Known Issues).\par + \pard\b\fs24\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.6.0.2.\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 No Windows-specific bugfixes.\par + \pard\b\fs24\par Changes since Git-1.5.6-preview20080622\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.1.\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 Includes fixed msys-1.0.dll that supports Vista and Windows Server 2008 (Issue 122).\par {\pntext\f2\'B7\tab}cmd wrappers do no longer switch off echo.\par + \pard\b\fs24\par 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 + \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 {\pntext\f2\'B7\tab}cmd wrapper does no longer close the command window.\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 + \pard\b\fs24\par Changes since Git-1.5.4-preview20080202\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.5.\par {\pntext\f2\'B7\tab}core.autocrlf is enabled (true) by default. This means git converts to Windows line endings (CRLF) during checkout and converts to Unix line endings (LF) during commit. This is the right choice for cross-platform projects. If the conversion is not reversible, git warns the user. The installer warns about the new default before the installation starts.\par {\pntext\f2\'B7\tab}The user does no longer have to "accept" the GPL but only needs to press "continue".\par {\pntext\f2\'B7\tab}Installer deletes shell scripts that have been replaced by builtins. Upgrading should be safer.\par {\pntext\f2\'B7\tab}Supports "git svn". Note that the performance might be below your expectation.\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 Newer ssh fixes connection failures (issue 74).\par {\pntext\f2\'B7\tab}Comes with MSys-1.0.11-20071204. This should solve some "fork: resource unavailable" issues.\par {\pntext\f2\'B7\tab}All DLLs are rebased to avoid problems with "fork" on Vista.\par + \pard\b\fs24\par Changes since Git-1.5.3.6-preview20071126\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.4.\par {\pntext\f2\'B7\tab}Some commands that are not yet suppoted on Windows are no longer included (see Known Issues above).\par {\pntext\f2\'B7\tab}Release notes are displayed in separate window.\b\fs24\par -\b0\fs20{\pntext\f2\'B7\tab}Includes qsort replacement to improve performance on Windows 2000.\par +{\pntext\f2\'B7\tab}\b0\fs20 Includes qsort replacement to improve performance on Windows 2000.\par + \pard\b\fs24\par \i\fs20 Bugfixes\b0\i0\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432 Fixes invalid error message that setup.ini cannot be deleted on uninstall.\par {\pntext\f2\'B7\tab}Setup tries harder to finish the installation and reports more detailed errors.\par {\pntext\f2\'B7\tab}Vim's syntax highlighting is suitable for dark background.\par + \pard\b\fs24\par Changes since Git-1.5.3.5-preview20071114\par \par \i\fs20 New Features\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Git is included in version 1.5.3.6.\b\i\par -\b0\i0{\pntext\f2\'B7\tab}Setup displays release notes.\par +{\pntext\f2\'B7\tab}\b0\i0 Setup displays release notes.\par + \pard\b\fs24\par \i\fs20 Bugfixes\b0\i0\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432 pull/fetch/push in git-gui works. Note, there is no way for ssh to ask for a passphrase or for confirmation if you connect to an unknown host. So, you must have ssh set up to work without passphrase. Either you have a key without passphrase, or you started ssh-agent. You may also consider using PuTTY by pointing GIT_SSH to plink.exe and handle your ssh keys with Pageant. In this case you should include your login name in urls. You must also connect to an unknown host once from the command line and confirm the host key, before you can use it from git-gui.\par + \pard\b\fs24\par Changes since Git-1.5.3-preview20071027\fs20\par \i\par New Features\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Git is included in version 1.5.3.5.\par {\pntext\f2\'B7\tab}Setup can be installed as normal user.\par {\pntext\f2\'B7\tab}When installing as Administrator, all icons except the Quick Launch icon will be created for all users.\par {\pntext\f2\'B7\tab}"git help user-manual" displays the user manual.\par + \pard\b\par \i Bugfixes\b0\i0\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432 Git Bash works on Windows XP 64.\par + \pard\par \b\fs24 Changes since Git-1.5.3-preview20071019\par \fs20\par \i Bugfixes\i0\par + \pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0 The templates for a new repository are found.\par {\pntext\f2\'B7\tab}The global configuration /etc/gitconfig is found.\par {\pntext\f2\'B7\tab}Git Gui localization works. It falls back to English if a translation has errors.\par + \pard\par \b\fs24 Changes since WinGit-0.2-alpha\par \b0\fs20 The history of the release notes stops here. Various new features and bugfixes are available since WinGit-0.2-alpha. Please check the git history of the msysgit project for details.\par diff --git a/src/git-cheetah b/src/git-cheetah index 97e4f682..703df3f3 160000 --- a/src/git-cheetah +++ b/src/git-cheetah @@ -1 +1 @@ -Subproject commit 97e4f6828ebcb8481999b600bc7a33cb20ec564d +Subproject commit 703df3f3e6484edeb50864c53bbf0df59e74df68