diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-31 21:55:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-08 02:37:27 (GMT) |
| commit | acef41c9db33f2261e46e17cca098df3403dd745 (patch) | |
| tree | 63177195e70d43e7ed3902d2790061690fc35474 /builtin-show-branch.c | |
| parent | 6d0618a820a20846d60b665897fcce600f452eec (diff) | |
| download | git-acef41c9db33f2261e46e17cca098df3403dd745.zip git-acef41c9db33f2261e46e17cca098df3403dd745.tar.gz git-acef41c9db33f2261e46e17cca098df3403dd745.tar.bz2 | |
format-patch -s: add MIME encoding header if signer's name requires so
When the body of the commit log message contains a non-ASCII character,
format-patch correctly emitted the encoding header to mark the resulting
message as such. However, if the original message was fully ASCII, the
command line switch "-s" was given to add a new sign-off, and
the signer's name was not ASCII only, the resulting message would have
contained non-ASCII character but was not marked as such.
This was cherry-picked from the fix in 'master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-show-branch.c')
| -rw-r--r-- | builtin-show-branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-show-branch.c b/builtin-show-branch.c index 4fa87f6..b9cf1b3 100644 --- a/builtin-show-branch.c +++ b/builtin-show-branch.c @@ -267,7 +267,7 @@ static void show_one_commit(struct commit *commit, int no_name) if (commit->object.parsed) { pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, &pretty, &pretty_len, - 0, NULL, NULL, 0); + 0, NULL, NULL, 0, 0); pretty_str = pretty; } if (!prefixcmp(pretty_str, "[PATCH] ")) |