diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-29 11:24:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-29 11:24:36 -0700 |
| commit | c9eaaab4165d8f402930d12899ec097495b599e6 (patch) | |
| tree | a2a87dcdeb059a2b1de7090380564e524e4e78fb | |
| parent | 1ba5c532e1f6ede63fd46bf6b647e70baa10a364 (diff) | |
| parent | a1463920565c67646507dc573d3f5280fa4cdcf3 (diff) | |
| download | git-c9eaaab4165d8f402930d12899ec097495b599e6.tar.gz git-c9eaaab4165d8f402930d12899ec097495b599e6.tar.xz | |
Sync with 1.7.1.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes-1.7.1.1.txt | 13 | ||||
| -rwxr-xr-x | t/t9001-send-email.sh | 6 |
2 files changed, 6 insertions, 13 deletions
diff --git a/Documentation/RelNotes-1.7.1.1.txt b/Documentation/RelNotes-1.7.1.1.txt index 1f94db8bd..3f6b3148a 100644 --- a/Documentation/RelNotes-1.7.1.1.txt +++ b/Documentation/RelNotes-1.7.1.1.txt @@ -1,5 +1,5 @@ -Git v1.7.1.1 Release Notes (draft) -================================== +Git v1.7.1.1 Release Notes +========================== Fixes since v1.7.1 ------------------ @@ -28,7 +28,7 @@ Fixes since v1.7.1 * 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. + on the presence of such blank lines. * "git bundle --stdin" segfaulted. @@ -94,10 +94,3 @@ Fixes since v1.7.1 * "git status" showed excess "hints" even when advice.statusHints is set to false. And other minor fixes and documentation updates. - - --- -exec >/var/tmp/1 -O=v1.7.1-211-g54fcb21 -echo O=$(git describe HEAD) -git shortlog --no-merges HEAD ^$O diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 0b8a59150..382ab6c98 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -943,7 +943,7 @@ test_expect_success 'asks about and fixes 8bit encodings' ' grep "do not declare a Content-Transfer-Encoding" stdout && grep email-using-8bit stdout && grep "Which 8bit encoding" stdout && - grep "Content\\|MIME" msgtxt1 >actual && + egrep "Content|MIME" msgtxt1 >actual && test_cmp actual content-type-decl ' @@ -954,7 +954,7 @@ test_expect_success 'sendemail.8bitEncoding works' ' git send-email --from=author@example.com --to=nobody@example.com \ --smtp-server="$(pwd)/fake.sendmail" \ email-using-8bit >stdout && - grep "Content\\|MIME" msgtxt1 >actual && + egrep "Content|MIME" msgtxt1 >actual && test_cmp actual content-type-decl ' @@ -966,7 +966,7 @@ test_expect_success '--8bit-encoding overrides sendemail.8bitEncoding' ' --smtp-server="$(pwd)/fake.sendmail" \ --8bit-encoding=UTF-8 \ email-using-8bit >stdout && - grep "Content\\|MIME" msgtxt1 >actual && + egrep "Content|MIME" msgtxt1 >actual && test_cmp actual content-type-decl ' |