From 678125baa3dc734a72ddf067eb3c013bde556cd0 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Fri, 8 Jul 2011 13:48:06 +0100 Subject: [PATCH] Updated to Git v1.7.6 Signed-off-by: Pat Thoyts --- doc/git/html | 2 +- git | 2 +- share/WinGit/ReleaseNotes.rtf | 16 +++++++++++++--- share/WinGit/copy-files.sh | 2 +- src/git-cheetah | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/doc/git/html b/doc/git/html index 103b5722..c652aed8 160000 --- a/doc/git/html +++ b/doc/git/html @@ -1 +1 @@ -Subproject commit 103b5722e7729973bb843e748abe7d4c8f8f9a28 +Subproject commit c652aed8923d6b63b98c910666b861a766217891 diff --git a/git b/git index 844cb221..bf1a7ff5 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 844cb2210d9fc66627c562b7a2fdaf6b9cd52ae1 +Subproject commit bf1a7ff510a4ad08c8e05e9905c00a30ec22d37c diff --git a/share/WinGit/ReleaseNotes.rtf b/share/WinGit/ReleaseNotes.rtf index 0d504471..182165ed 100644 --- a/share/WinGit/ReleaseNotes.rtf +++ b/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.2509;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.4-preview20110204)\b0\fs20\par -Last update: 4 February 2011\par +{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.6-preview20110708)\b0\fs20\par +Last update: 8 July 2011\par \par \b\fs24 Introduction\b0\fs20\par \par @@ -9,7 +9,7 @@ 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 {\field{\*\fldinst{HYPERLINK "http://msysgit.googlecode.com/"}}{\fldrslt{\ul\cf2 http://msysgit.googlecode.com/}}}\f0\fs20 .\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.googlecode.com/"}}{\fldrslt{\ul\cf2 http://msysgit.googlecode.com/}}}\cf1\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 @@ -21,6 +21,16 @@ See \cf0{\field{\*\fldinst{HYPERLINK "http://git-scm.com/"}}{\fldrslt{\ul\cf2 ht {\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 \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}Fixed 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 diff --git a/share/WinGit/copy-files.sh b/share/WinGit/copy-files.sh index 9b7f0fad..01f535b8 100755 --- a/share/WinGit/copy-files.sh +++ b/share/WinGit/copy-files.sh @@ -81,7 +81,7 @@ fi && lib/{tcl,tk,dde,reg}* libexec/gnupg/) | tar xf - && cp $MSYSGITROOT/mingw/bin/hd2u.exe bin/dos2unix.exe && -md5sum $MSYSGITROOT/bin/msys-1.0.dll > etc/msys-1.0.dll.md5 && +(md5sum $MSYSGITROOT/bin/msys-1.0.dll | awk '{print $1, "*/bin/msys-1.0.dll"}') > etc/msys-1.0.dll.md5 && strip bin/{[a-fh-z],g[a-oq-z]}*.exe libexec/git-core/*.exe && cp $MSYSGITROOT/git/contrib/completion/git-completion.bash etc/ && cp $MSYSGITROOT/etc/termcap etc/ && diff --git a/src/git-cheetah b/src/git-cheetah index b02922ec..0cf821c7 160000 --- a/src/git-cheetah +++ b/src/git-cheetah @@ -1 +1 @@ -Subproject commit b02922ecea733c11fbd2e5b5a86964fed41ebb54 +Subproject commit 0cf821c7fadabb7522c92d4371dcff2fe8d4b34f -- 2.11.4.GIT