undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Junio C Hamano 2012-09-14 21:38:20 -07:00
commit 66c349027b
3 changed files with 137 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Documentation/RelNotes/1.7.11.7.txt Normal file
View File

@ -0,0 +1,46 @@
Git v1.7.11.7 Release Notes
===========================
Fixes since v1.7.11.6
---------------------
* The synopsis said "checkout [-B branch]" to make it clear the
branch name is a parameter to the option, but the heading for the
option description was "-B::", not "-B branch::", making the
documentation misleading.
* Git ships with a fall-back regexp implementation for platforms with
buggy regexp library, but it was easy for people to keep using their
platform regexp. A new test has been added to check this.
* "git apply -p0" did not parse pathnames on "diff --git" line
correctly. This caused patches that had pathnames in no other
places to be mistakenly rejected (most notably, binary patch that
does not rename nor change mode). Textual patches, renames or mode
changes have preimage and postimage pathnames in different places
in a form that can be parsed unambiguously and did not suffer from
this problem.
* After "gitk" showed the contents of a tag, neither "Reread
references" nor "Reload" did not update what is shown as the
contents of it, when the user overwrote the tag with "git tag -f".
* "git for-each-ref" did not currectly support more than one --sort
option.
* "git log .." errored out saying it is both rev range and a path
when there is no disambiguating "--" is on the command line.
Update the command line parser to interpret ".." as a path in such
a case.
* Pushing to smart HTTP server with recent Git fails without having
the username in the URL to force authentication, if the server is
configured to allow GET anonymously, while requiring authentication
for POST.
* "git show --format='%ci'" did not give timestamp correctly for
commits created without human readable name on "committer" line.
(merge e27ddb6 jc/maint-ident-missing-human-name later to maint).
* "git show --quiet" ought to be a synonym for "git show -s", but
wasn't.

156
Documentation/RelNotes/1.7.12.1.txt
View File

@ -4,25 +4,94 @@ Git 1.7.12.1 Release Notes
Fixes since v1.7.12 Fixes since v1.7.12
------------------- -------------------
* "ciabot" script (in contrib/) has been updated with extensive * "git apply -p0" did not parse pathnames on "diff --git" line
documentation. correctly. This caused patches that had pathnames in no other
places to be mistakenly rejected (most notably, binary patch that
does not rename nor change mode). Textual patches, renames or mode
changes have preimage and postimage pathnames in different places
in a form that can be parsed unambiguously and did not suffer from
this problem.
* The "--rebase" option to "git pull" can be abbreviated to "-r", * "git cherry-pick A C B" used to replay changes in A and then B and
but we didn't document it. then C if these three commits had committer timestamps in that
order, which is not what the user who said "A C B" naturally
expects.
* It was generally understood that "--long-option"s to many of our * "git commit --amend" let the user edit the log message and then
subcommands can be abbreviated to the unique prefix, but it was not died when the human-readable committer name was given
easy to find it described for new readers of the documentation set. insufficiently by getpwent(3).
* The synopsis said "checkout [-B branch]" to make it clear the * Some capabilities were asked by fetch-pack even when upload-pack
branch name is a parameter to the option, but the heading for the did not advertise that they are available. fetch-pack has been
option description was "-B::", not "-B branch::", making the fixed not to do so.
documentation misleading.
* "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.
* "git for-each-ref" did not correctly support more than one --sort
option.
* "git log .." errored out saying it is both rev range and a path
when there is no disambiguating "--" is on the command line.
Update the command line parser to interpret ".." as a path in such
a case.
* The "--topo-order", "--date-order" (and the lack of either means * The "--topo-order", "--date-order" (and the lack of either means
the default order) options to "rev-list" and "log" family of the default order) options to "rev-list" and "log" family of
commands were poorly described in the documentation. commands were poorly described in the documentation.
* "git prune" without "-v" used to warn about leftover temporary
files (which is an indication of an earlier aborted operation).
* Pushing to smart HTTP server with recent Git fails without having
the username in the URL to force authentication, if the server is
configured to allow GET anonymously, while requiring authentication
for POST.
* The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent (the interactive one gave an abbreviated object name).
* 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 show --quiet" ought to be a synonym for "git show -s", but
wasn't.
* "git show --format='%ci'" did not give timestamp correctly for
commits created without human readable name on "committer" line.
* "git send-email" did not unquote encoded words that appear on the
header correctly, and lost "_" from strings.
* The interactive prompt "git send-email" gives was error prone. It
asked "What e-mail address do you want to use?" with the address it
guessed (correctly) the user would want to use in its prompt,
tempting the user to say "y". But the response was taken as "No,
please use 'y' as the e-mail address instead", which is most
certainly not what the user meant.
* "gitweb" when used with PATH_INFO failed to notice directories with
SP (and other characters that need URL-style quoting) in them.
* 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.
* 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.
* After "gitk" showed the contents of a tag, neither "Reread
references" nor "Reload" did not update what is shown as the
contents of it, when the user overwrote the tag with "git tag -f".
* "ciabot" script (in contrib/) has been updated with extensive
documentation.
* 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 file in .git/refs/ hierarchy were the only way to have branches and
tags, which is not true for quite some time. tags, which is not true for quite some time.
@ -41,61 +110,14 @@ Fixes since v1.7.12
* Fallback 'getpass' implementation made unportable use of stdio API. * Fallback 'getpass' implementation made unportable use of stdio API.
* "git apply -p0" did not parse pathnames on "diff --git" line * The "--rebase" option to "git pull" can be abbreviated to "-r",
correctly. This caused patches that had pathnames in no other but we didn't document it.
places to be mistakenly rejected (most notably, binary patch that
does not rename nor change mode). Textual patches, renames or mode
changes have preimage and postimage pathnames in different places
in a form that can be parsed unambiguously and did not suffer from
this problem.
* "git commit --amend" let the user edit the log message and then * It was generally understood that "--long-option"s to many of our
died when the human-readable committer name was given subcommands can be abbreviated to the unique prefix, but it was not
insufficiently by getpwent(3). easy to find it described for new readers of the documentation set.
* Some capabilities were asked by fetch-pack even when upload-pack * The synopsis said "checkout [-B branch]" to make it clear the
did not advertise that they are available. fetch-pack has been branch name is a parameter to the option, but the heading for the
fixed not to do so. option description was "-B::", not "-B branch::", making the
documentation misleading.
* "git for-each-ref" did not currectly support more than one --sort
option.
* "git log .." errored out saying it is both rev range and a path
when there is no disambiguating "--" is on the command line.
Update the command line parser to interpret ".." as a path in such
a case.
* "git prune" without "-v" used to warn about leftover temporary
files (which is an indication of an earlier aborted operation).
* Pushing to smart HTTP server with recent Git fails without having
the username in the URL to force authentication, if the server is
configured to allow GET anonymously, while requiring authentication
for POST.
* The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent (the interactive one gave an abbreviated object name).
* 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.
* 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.
* "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.
* "gitweb" when used with PATH_INFO failed to notice directories with
SP (and other characters that need URL-style quoting) in them.

3
Documentation/git.txt
View File

@ -48,9 +48,10 @@ Documentation for older releases are available here:
* release notes for * release notes for
link:RelNotes/1.7.12.txt[1.7.12]. link:RelNotes/1.7.12.txt[1.7.12].
* link:v1.7.11.6/git.html[documentation for release 1.7.11.6] * link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
* release notes for * release notes for
link:RelNotes/1.7.11.7.txt[1.7.11.7],
link:RelNotes/1.7.11.6.txt[1.7.11.6], 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.5.txt[1.7.11.5],
link:RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.4.txt[1.7.11.4],