diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2012-03-13 09:05:54 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-14 01:26:33 +0400 |
| commit | 6dd88832e77ad7c0c7f82522d3741b5b7bf62fbd (patch) | |
| tree | 52a1cb27cd23d28d71dbf9647b759ac2ad2d967e /t/t4014-format-patch.sh | |
| parent | 2983c0e22a5b6a56b8f5d7bb2dd2a3a0e26ac005 (diff) | |
diffstat summary line varies by locale: miscellany
These changes are in the same spirit as the six patches that
precede them, but they haven't been split into individually
justifiable patches yet.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4014-format-patch.sh')
| -rwxr-xr-x | t/t4014-format-patch.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 7dfe716cf9..b473b6d6eb 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -518,11 +518,6 @@ test_expect_success 'shortlog of cover-letter wraps overly-long onelines' ' ' cat > expect << EOF ---- - file | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/file b/file index 40f36c6..2dc5c23 100644 --- a/file +++ b/file @@ -537,7 +532,9 @@ EOF test_expect_success 'format-patch respects -U' ' git format-patch -U4 -2 && - sed -e "1,/^\$/d" -e "/^+5/q" < 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch > output && + sed -e "1,/^diff/d" -e "/^+5/q" \ + <0001-This-is-an-excessively-long-subject-line-for-a-messa.patch \ + >output && test_cmp expect output ' |