From 23111fa5339d06f1b032f22cdaf68280157dcd80 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Mon, 25 Oct 2010 23:43:42 +0100 Subject: [PATCH] Updated for Git 1.7.3.2 Fixed the release.sh script to handle paths that include spaces when testing that git.exe is the newest file in /git. Signed-off-by: Pat Thoyts --- doc/git/html | 2 +- git | 2 +- share/WinGit/ReleaseNotes.rtf | 11 ++++++++--- share/WinGit/release.sh | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/doc/git/html b/doc/git/html index 0fd857e5..d2179ef0 160000 --- a/doc/git/html +++ b/doc/git/html @@ -1 +1 @@ -Subproject commit 0fd857e5bc36d9b8c88686a602c4ae253607487b +Subproject commit d2179ef025405832dff42141faed13199886b61c diff --git a/git b/git index 279f4c28..817ffd40 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 279f4c28cad4bd97dc06129118314b0a36f193db +Subproject commit 817ffd40eda2a812a498c37dfc38c3ff82e4baa8 diff --git a/share/WinGit/ReleaseNotes.rtf b/share/WinGit/ReleaseNotes.rtf index 0c8e250e..d9283ece 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.3.1-preview20101002)\b0\fs20\par -Last update: 2 October 2010\par +{\*\generator Msftedit 5.41.21.2509;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.3.2-preview20101025)\b0\fs20\par +Last update: 25 October 2010\par \par \b\fs24 Introduction\b0\fs20\par \par @@ -19,7 +19,12 @@ General release notes covering the history of the core git commands are included {\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.2.3-preview20100911\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 diff --git a/share/WinGit/release.sh b/share/WinGit/release.sh index 1a452d03..3b05796b 100644 --- a/share/WinGit/release.sh +++ b/share/WinGit/release.sh @@ -84,7 +84,7 @@ test -z "$force" && { git diff-index --cached HEAD --) || die "Git submodule has dirty files" (cd /git && - test git.exe = $(ls -t git.exe $(git ls-files) | head -n 1)) || + test git.exe = $((printf 'git.exe\0'; git ls-files -z) | xargs --null ls -t 2>/dev/null| head -1)) || die "Git's git.exe is not up-to-date (run 'cd /git && make' to fix)" for f in /bin/git* /libexec/git-core/git* do -- 2.11.4.GIT