mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 1.7.11.6

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2012-09-11 11:23:45 -07:00
parent 3119084104 e09e4024a0
commit 1c88a6d174
32 changed files with 585 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
Documentation/RelNotes/1.7.11.6.txt
View File

@ -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.
- 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.
- 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.
- 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).
- 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
* 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
* 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
* Documentation for the configuration file format had a confusing
example.
* 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.
* 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.
* 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
died when the human-readable committer name was given
insufficiently by getpwent(3).
* 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".
* 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.
* 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.
* 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
header correctly, and lost "_" from strings.
* "git stash apply/pop" did not trigger "rerere" upon conflicts
unlike other mergy operations.
* "git submodule <cmd> path" did not error out when the path to the
submodule was misspelt.
* "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.

4
Documentation/asciidoc.conf
View File

@ -36,7 +36,7 @@ ifndef::git-asciidoc-no-roff[]
# v1.72 breaks with this because it replaces dots not in roff requests.
[listingblock]
<example><title>{title}</title>
<literallayout>
<literallayout class="monospaced">
ifdef::doctype-manpage[]
&#10;.ft C&#10;
endif::doctype-manpage[]
@ -53,7 +53,7 @@ ifdef::doctype-manpage[]
# The following two small workarounds insert a simple paragraph after screen
[listingblock]
<example><title>{title}</title>
<literallayout>
<literallayout class="monospaced">
|
</literallayout><simpara></simpara>
{title#}</example>

12
Documentation/git-config.txt
View File

@ -54,16 +54,16 @@ configuration file by default, and options '--system', '--global',
'--file <filename>' can be used to tell the command to write to
that location (you can say '--local' but that is the default).
This command will fail (with exit code ret) if:
This command will fail with non-zero status upon error. Some exit
codes are:
. The config file is invalid (ret=3),
. can not write to the config file (ret=4),
. no section or name was provided (ret=2),
. the section or key is invalid (ret=1),
. you try to unset an option which does not exist (ret=5),
. you try to unset/set an option for which multiple lines match (ret=5),
. you try to use an invalid regexp (ret=6), or
. you use '--global' option without $HOME being properly set (ret=128).
. you try to unset/set an option for which multiple lines match (ret=5), or
. you try to use an invalid regexp (ret=6).
On success, the command returns the exit code 0.
@ -267,7 +267,7 @@ Given a .git/config like this:
; Proxy settings
[core]
gitproxy="proxy-command" for kernel.org
gitproxy=proxy-command for kernel.org
gitproxy=default-proxy ; for all the rest
you can set the filemode to true with
@ -342,7 +342,7 @@ To actually match only values with an exclamation mark, you have to
To add a new proxy, without altering any of the existing ones, use
------------
% git config core.gitproxy '"proxy-command" for example.com'
% git config --add core.gitproxy '"proxy-command" for example.com'
------------
An example to use customized color from the configuration in your

9
Documentation/git-submodule.txt
View File

@ -149,6 +149,11 @@ submodule with the `--init` option.
+
If `--recursive` is specified, this command will recurse into the
registered submodules, and update any nested submodules within.
+
If `--force` is specified, the submodule will be checked out (using
`git checkout --force` if appropriate), even if the commit specified in the
index of the containing repository already matches the commit checked out in
the submodule.
summary::
Show commit summary between the given commit (defaults to HEAD) and
@ -210,7 +215,9 @@ OPTIONS
This option is only valid for add and update commands.
When running add, allow adding an otherwise ignored submodule path.
When running update, throw away local changes in submodules when
switching to a different commit.
switching to a different commit; and always run a checkout operation
in the submodule, even if the commit listed in the index of the
containing repository matches the commit checked out in the submodule.
--cached::
This option is only valid for status and summary commands. These

3
Documentation/git.txt
View File

@ -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],

2
Documentation/user-manual.conf
View File

@ -14,7 +14,7 @@ ifdef::backend-docbook[]
# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
[listingblock]
<example><title>{title}</title>
<literallayout>
<literallayout class="monospaced">
|
</literallayout>
{title#}</example>