From 993297717341ef7613ce21d34a9a6b475ed1a67b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 21 Jun 2010 05:48:18 -0700 Subject: [PATCH 1/2] Update draft release notes to 1.7.1.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.1.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt index 2eef0380ea..e0386a43f0 100644 --- a/Documentation/RelNotes-1.7.1.1.txt +++ b/Documentation/RelNotes-1.7.1.1.txt @@ -15,14 +15,31 @@ Fixes since v1.7.1 macro that set/unset one attribute, immediately followed by an overriding setting; this makes attribute macros much easier to use. + * We didn't recognize timezone "Z" as a synonym for "UTC" (75b37e70). + * "git am -3" did not show diagnosis when the patch in the message was corrupt. + * After "git apply --whitespace=fix" removed trailing blank lines in an + patch in a patch series, it failed to apply later patches that depend + on the presense of such blank lines. + * "git bundle --stdin" segfaulted. + * "git checkout" and "git rebase" overwrote paths that are marked "assume + unchanged". + * "git describe" did not tie-break tags that point at the same commit correctly; newer ones are preferred by paying attention to the tagger date now. + * "git diff" used to tell underlying xdiff machinery to work very hard to + minimize the output, but this often was spending too many extra cycles + for very little gain. + + * "git diff --color" did not paint extended diff headers per line + (i.e. the coloring escape sequence didn't end at the end of line), + which confused "less -R". + * "git fetch" over HTTP verifies the downloaded packfiles more robustly. * The memory usage by "git index-pack" (run during "git fetch" and "git @@ -32,6 +49,10 @@ Fixes since v1.7.1 * "git log --abbrev=$num --format='%h' ignored --abbrev=$num. + * "git pull" accepted "--dry-run", gave it to underlying "git fetch" but + ignored the option itself, resulting in a bogus attempt to merge + unrelated commit. + * "git send-email" lacked a way to specify the domainname used in the EHLO/HELO exchange, causing rejected connection from picky servers. It learned --smtp-domain option to solve this issue. From 8c6b5a84547506c1cfabb966f27a10f5659e7e0b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 21 Jun 2010 05:49:26 -0700 Subject: [PATCH 2/2] Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes --- Documentation/RelNotes-1.7.2.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/Documentation/RelNotes-1.7.2.txt b/Documentation/RelNotes-1.7.2.txt index bd87a91746..a1b5428df4 100644 --- a/Documentation/RelNotes-1.7.2.txt +++ b/Documentation/RelNotes-1.7.2.txt @@ -19,10 +19,6 @@ Updates since v1.7.1 * "git" wrapper learned "-c name=value" option to override configuration variable from the command line. - * After "git apply --whitespace=fix" removed trailing blank lines in an - patch in a patch series, it failed to apply later patches that depend - on the presense of such blank lines. - * The message from "git am -3" has been improved when conflict resolution ended up making the patch a no-op. @@ -39,10 +35,6 @@ Updates since v1.7.1 * The output from the textconv filter used by "git diff" can be cached to speed up their reuse. - * "git diff --color" did not paint extended diff headers per line - (i.e. the coloring escape sequence didn't end at the end of line), - which confused "less -R". - * "git diff --word-diff=" extends the existing "--color-words" option, making it more useful in color-challenged environments. @@ -90,14 +82,9 @@ Fixes since v1.7.1 All of the fixes in v1.7.1.X maintenance series are included in this release, unless otherwise noted. - * We didn't recognize timezone "Z" as a synonym for "UTC" (75b37e70). - * We didn't URL decode "file:///path/to/repo" correctly when path/to/repo had percent-encoded characters (638794c, 9d2e942). - * "git checkout" and "git rebase" overwrote paths that are marked "assume - unchanged" (aecda37c). - * "git clone/fetch/pull" issued an incorrect error message when a ref and a symref that points to the ref were updated at the same time. This obviously would update them to the same value, and should not result in @@ -106,10 +93,6 @@ release, unless otherwise noted. * "git clone" did not configure remote.origin.url correctly for bare clones (df61c889). - * "git diff" used to tell underlying xdiff machinery to work very hard to - minimize the output, but this often was spending too many extra cycles - for very little gain (582aa00). - * "git diff --graph" works better with "--color-words" and other options (81fa024..4297c0a). @@ -119,10 +102,6 @@ release, unless otherwise noted. * "git merge --log" used to replace the custom message given by "-m" with the shortlog, instead of appending to it (tc/merge-m-log). - * "git pull" accepted "--dry-run", gave it to underlying "git fetch" but - ignored the option itself, resulting in a bogus attempt to merge - unrelated commit (29609e68). - * "git reset --hard" started from a wrong directory and a working tree in a nonstandard location is in use got confused (560fb6a1).