diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:54:01 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:54:01 -0700 |
commit | caa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch) | |
tree | bbfbe6ac84575766b4752e48960d12288a8b6c42 /t/t4014-format-patch.sh | |
parent | e2af9e361b1d7452492baa073790b19292f9c038 (diff) | |
parent | a46221e9adcf3deb88c4fc904859205bf87f784c (diff) | |
download | git-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.gz |
Sync with 'maint'
* maint:
Correct common spelling mistakes in comments and tests
kwset: fix spelling in comments
precompose-utf8: fix spelling of "want" in error message
compat/nedmalloc: fix spelling in comments
compat/regex: fix spelling and grammar in comments
obstack: fix spelling of similar
contrib/subtree: fix spelling of accidentally
git-remote-mediawiki: spelling fixes
doc: various spelling fixes
fast-export: fix argument name in error messages
Documentation: distinguish between ref and offset deltas in pack-format
i18n: make the translation of -u advice in one go
Diffstat (limited to 't/t4014-format-patch.sh')
-rwxr-xr-x | t/t4014-format-patch.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index b993dae645..86ee077107 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -742,21 +742,21 @@ test_expect_success 'format-patch --signature --cover-letter' ' test 2 = $(grep "my sig" output | wc -l) ' -test_expect_success 'format.signature="" supresses signatures' ' +test_expect_success 'format.signature="" suppresses signatures' ' git config format.signature "" && git format-patch --stdout -1 >output && check_patch output && ! grep "^-- \$" output ' -test_expect_success 'format-patch --no-signature supresses signatures' ' +test_expect_success 'format-patch --no-signature suppresses signatures' ' git config --unset-all format.signature && git format-patch --stdout --no-signature -1 >output && check_patch output && ! grep "^-- \$" output ' -test_expect_success 'format-patch --signature="" supresses signatures' ' +test_expect_success 'format-patch --signature="" suppresses signatures' ' git format-patch --stdout --signature="" -1 >output && check_patch output && ! grep "^-- \$" output |