From: Junio C Hamano Date: Mon, 12 Mar 2012 22:52:52 +0000 (-0700) Subject: Git 1.7.9.4 X-Git-Tag: v1.7.9.4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c1c91a83a1fd6b250fa0d2ec43bbf2aef5daabf2;p=git.git Git 1.7.9.4 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes/1.7.9.4.txt b/Documentation/RelNotes/1.7.9.4.txt new file mode 100644 index 000000000..e5217a188 --- /dev/null +++ b/Documentation/RelNotes/1.7.9.4.txt @@ -0,0 +1,24 @@ +Git v1.7.9.4 Release Notes +========================== + +Fixes since v1.7.9.3 +-------------------- + + * The code to synthesize the fake ancestor tree used by 3-way merge + fallback in "git am" was not prepared to read a patch created with + a non-standard -p value. + + * "git bundle" did not record boundary commits correctly when there + are many of them. + + * "git diff-index" and its friends at the plumbing level showed the + "diff --git" header and nothing else for a path whose cached stat + info is dirty without actual difference when asked to produce a + patch. This was a longstanding bug that we could have fixed long + time ago. + + * "gitweb" did use quotemeta() to prepare search string when asked to + do a fixed-string project search, but did not use it by mistake and + used the user-supplied string instead. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index b257d80c7..d5b7667c1 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.9.3/git.html[documentation for release 1.7.9.3] +* link:v1.7.9.4/git.html[documentation for release 1.7.9.4] * release notes for + link:RelNotes/1.7.9.4.txt[1.7.9.4], link:RelNotes/1.7.9.3.txt[1.7.9.3], link:RelNotes/1.7.9.2.txt[1.7.9.2], link:RelNotes/1.7.9.1.txt[1.7.9.1], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index de203dd28..8ddc96d95 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.9.3 +DEF_VER=v1.7.9.4 LF=' ' diff --git a/RelNotes b/RelNotes index 36a588545..f9f04dd38 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.9.3.txt \ No newline at end of file +Documentation/RelNotes/1.7.9.4.txt \ No newline at end of file