Sync with 1.7.1.1

Signed-off-by: Junio C Hamano <[email protected]>

Author: gitster

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

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 [email protected] [email protected] \
 			--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
 '