From e09e4024a070e666ed40b66442e8151b91d623e4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 11 Sep 2012 11:18:48 -0700 Subject: [PATCH] Git 1.7.11.6 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.11.6.txt | 88 +++++++++++++++++++++++-------------- Documentation/git.txt | 3 +- GIT-VERSION-GEN | 2 +- 3 files changed, 58 insertions(+), 35 deletions(-) diff --git a/Documentation/RelNotes/1.7.11.6.txt b/Documentation/RelNotes/1.7.11.6.txt index 84ba827b1b..ba7d3c3966 100644 --- a/Documentation/RelNotes/1.7.11.6.txt +++ b/Documentation/RelNotes/1.7.11.6.txt @@ -4,59 +4,81 @@ Git v1.7.11.6 Release Notes Fixes since v1.7.11.5 --------------------- -This consists primarily of documentation updates and low-impact code -clarification and bugfixes. - - - "ciabot" script (in contrib/) has been updated with extensive + * "ciabot" script (in contrib/) has been updated with extensive documentation. - - The "--rebase" option to "git pull" can be abbreviated to "-r", - but we didn't document it. + * "git foo" errored out with "Not a directory" when the user had a + non-directory on $PATH, and worse yet it masked an alias "foo" from + running. - - It was generally understood that "--long-option"s to many of our - subcommands can be abbreviated to the unique prefix, but it was not - easy to find it described for new readers of the documentation set. + * When the user exports a non-default IFS without HT, scripts that + rely on being able to parse "ls-files -s | while read a b c..." + started to fail. Protect them from such a misconfiguration. - - The "--topo-order", "--date-order" (and the lack of either means - the default order) options to "rev-list" and "log" family of - commands were poorly described in the documentation. + * When the user gives an argument that can be taken as both a + revision name and a pathname without disambiguating with "--", we + used to give a help message "Use '--' to separate". The message + has been clarified to show where that '--' goes on the command + line. + + * Documentation for the configuration file format had a confusing + example. - - Older parts of the documentation described as if having a regular + * Older parts of the documentation described as if having a regular file in .git/refs/ hierarchy were the only way to have branches and tags, which is not true for quite some time. - - A utility shell function test_seq has been added as a replacement - for the 'seq' utility found on some platforms. + * It was generally understood that "--long-option"s to many of our + subcommands can be abbreviated to the unique prefix, but it was not + easy to find it described for new readers of the documentation set. - - Fallback 'getpass' implementation made unportable use of stdio API. + * The "--topo-order", "--date-order" (and the lack of either means + the default order) options to "rev-list" and "log" family of + commands were poorly described in the documentation. - - "git commit --amend" let the user edit the log message and then + * "git commit --amend" let the user edit the log message and then died when the human-readable committer name was given insufficiently by getpwent(3). - - The reflog entries left by "git rebase" and "git rebase -i" were - inconsistent (the interactive one gave an abbreviated object name). + * The exit status code from "git config" was way overspecified while + being incorrect. The implementation has been updated to give the + documented status for a case that was documented, and introduce a + new code for "all other errors". - - When the user exports a non-default IFS without HT, scripts that - rely on being able to parse "ls-files -s | while read a b c..." - started to fail. Protect them from such a misconfiguration. + * The output from "git diff -B" for a file that ends with an + incomplete line did not put "\ No newline..." on a line of its own. + + * "git diff" had a confusion between taking data from a path in the + working tree and taking data from an object that happens to have + name 0{40} recorded in a tree. - - When "git push" triggered the automatic gc on the receiving end, a + * The "--rebase" option to "git pull" can be abbreviated to "-r", + but we didn't document it. + + * When "git push" triggered the automatic gc on the receiving end, a message from "git prune" that said it was removing cruft leaked to the standard output, breaking the communication protocol. - - "git diff" had a confusion between taking data from a path in the - working tree and taking data from an object that happens to have - name 0{40} recorded in a tree. + * The reflog entries left by "git rebase" and "git rebase -i" were + inconsistent (the interactive one gave an abbreviated object name). - - "git send-email" did not unquote encoded words that appear on the + * "git send-email" did not unquote encoded words that appear on the header correctly, and lost "_" from strings. - - When the user gives an argument that can be taken as both a - revision name and a pathname without disambiguating with "--", we - used to give a help message "Use '--' to separate". The message - has been clarified to show where that '--' goes on the command - line. + * "git stash apply/pop" did not trigger "rerere" upon conflicts + unlike other mergy operations. + + * "git submodule path" did not error out when the path to the + submodule was misspelt. - - "gitweb" when used with PATH_INFO failed to notice directories with + * "git submodule update -f" did not update paths in the working tree + that has local changes. + (merge 01d4721 sz/submodule-force-update later to maint). + + * "gitweb" when used with PATH_INFO failed to notice directories with SP (and other characters that need URL-style quoting) in them. + + * Fallback 'getpass' implementation made unportable use of stdio API. + + * A utility shell function test_seq has been added as a replacement + for the 'seq' utility found on some platforms. diff --git a/Documentation/git.txt b/Documentation/git.txt index 677eb95995..165d13ad22 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.11.5/git.html[documentation for release 1.7.11.5] +* link:v1.7.11.6/git.html[documentation for release 1.7.11.6] * release notes for + link:RelNotes/1.7.11.6.txt[1.7.11.6], link:RelNotes/1.7.11.5.txt[1.7.11.5], link:RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index bab4056445..754b94e0d2 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.11.5 +DEF_VER=v1.7.11.6 LF=' ' -- 2.11.4.GIT