diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-03-05 06:21:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-05 06:21:52 (GMT) |
| commit | 91527e54d565e6fb6910fb3cb22f5915b5bd346e (patch) | |
| tree | d86ee11ed880f6776cc192cbd1fec25e77064e22 /Documentation | |
| parent | 38916c5b4740f6db09dc140a84bb470dfb582366 (diff) | |
| parent | ead8eb8c1092ce2d94d70872946829a7a946ae9d (diff) | |
| download | git-91527e54d565e6fb6910fb3cb22f5915b5bd346e.zip git-91527e54d565e6fb6910fb3cb22f5915b5bd346e.tar.gz git-91527e54d565e6fb6910fb3cb22f5915b5bd346e.tar.bz2 | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.9.3 for the last time
http.proxy: also mention https_proxy and all_proxy
t0300: work around bug in dash 0.5.6
t5512 (ls-remote): modernize style
tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.9.3.txt | 27 | ||||
| -rw-r--r-- | Documentation/config.txt | 7 |
2 files changed, 31 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.9.3.txt b/Documentation/RelNotes/1.7.9.3.txt index d7be177..91c6501 100644 --- a/Documentation/RelNotes/1.7.9.3.txt +++ b/Documentation/RelNotes/1.7.9.3.txt @@ -11,14 +11,41 @@ Fixes since v1.7.9.2 to link the binary with -lintl even when libintl.h is missing from the system. + * When the filter driver exits before reading the content before the + main git process writes the contents to be filtered to the pipe to + it, the latter could be killed with SIGPIPE instead of ignoring + such an event as an error. + * "git add --refresh <pathspec>" used to warn about unmerged paths outside the given pathspec. + * The bulk check-in codepath in "git add" streamed contents that + needs smudge/clean filters without running them, instead of punting + and delegating to the codepath to run filters after slurping + everything to core. + + * "git branch --with $that" assumed incorrectly that the user will never + ask the question with nonsense value in $that. + + * "git bundle create" produced a corrupt bundle file upon seeing + commits with excessively long subject line. + + * When a remote helper exits before reading the blank line from the + main git process to signal the end of commands, the latter could be + killed with SIGPIPE. Instead we should ignore such event as a + non-error. + * The commit log template given with "git merge --edit" did not have a short instructive text like what "git commit" gives. + * "git rev-list --verify-objects -q" omitted the extra verification + it needs to do over "git rev-list --objects -q" by mistake. + * "gitweb" used to drop warnings in the log file when "heads" view is accessed in a repository whose HEAD does not point at a valid branch. + * An invalid regular expression pattern given by an end user made + "gitweb" to return garbled response. + Also contains minor fixes and documentation updates. diff --git a/Documentation/config.txt b/Documentation/config.txt index 5367ba9..c081657 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1275,9 +1275,10 @@ help.autocorrect:: This is the default. http.proxy:: - Override the HTTP proxy, normally configured using the 'http_proxy' - environment variable (see linkgit:curl[1]). This can be overridden - on a per-remote basis; see remote.<name>.proxy + Override the HTTP proxy, normally configured using the 'http_proxy', + 'https_proxy', and 'all_proxy' environment variables (see + `curl(1)`). This can be overridden on a per-remote basis; see + remote.<name>.proxy http.cookiefile:: File containing previously stored cookie lines which should be used |