diff --git a/Documentation/RelNotes/1.7.11.6.txt b/Documentation/RelNotes/1.7.11.6.txt index 84ba827b1b63b0935268eb3c5cf4dca05db1b361..ba7d3c396653f8b6493e628dc87b5dcb2e655f97 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/RelNotes/1.7.12.1.txt b/Documentation/RelNotes/1.7.12.1.txt index c6ea0acb9a5d46044faffa24be6f6bc4b1dba82d..da51dd5392b3c635f1a901ccc1842aad70ae6ef1 100644 --- a/Documentation/RelNotes/1.7.12.1.txt +++ b/Documentation/RelNotes/1.7.12.1.txt @@ -25,12 +25,25 @@ Fixes since v1.7.12 * A utility shell function test_seq has been added as a replacement for the 'seq' utility found on some platforms. + * Compatibility wrapper to learn the maximum number of file + descriptors we can open around sysconf(_SC_OPEN_MAX) and + getrlimit(RLIMIT_NO_FILE) has been introduced for portability. + + * We used curl_easy_strerror() without checking version of cURL, + breaking the build for versions before curl 7.12.0. + + * Code to work around MacOS X UTF-8 gotcha has been cleaned up. + * Fallback 'getpass' implementation made unportable use of stdio API. * "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). + * Some capabilities were asked by fetch-pack even when upload-pack + did not advertise that they are available. fetch-pack has been + fixed not to do so. + * "git prune" without "-v" used to warn about leftover temporary files (which is an indication of an earlier aborted operation). diff --git a/Documentation/git.txt b/Documentation/git.txt index 463d567a878eb2a66396ea673035b7ff530b264b..fab6e77e02c9773a0230ac7dadf53670a60ac8a5 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -48,9 +48,10 @@ Documentation for older releases are available here: * release notes for link:RelNotes/1.7.12.txt[1.7.12]. -* 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],