aboutsummaryrefslogtreecommitdiff
path: root/builtin-show-branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-24 18:02:30 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-24 18:02:30 -0800
commitd1c7cd13dc7839b3c0b4d56a84f9effc9976144e (patch)
treeabe753b458d1258181130c62c67c3bb0680e2af3 /builtin-show-branch.c
parent18a135f419b803fd6d18c8e3f4b0194f11732d0f (diff)
parent6b945b9beee4cd01a58d875c0f83d018b4830ca0 (diff)
downloadgit-d1c7cd13dc7839b3c0b4d56a84f9effc9976144e.tar.gz
git-d1c7cd13dc7839b3c0b4d56a84f9effc9976144e.tar.xz
Merge branch 'jc/maint-format-patch-encoding' into maint
* jc/maint-format-patch-encoding: test format-patch -s: make sure MIME content type is shown as needed format-patch -s: add MIME encoding header if signer's name requires so
Diffstat (limited to 'builtin-show-branch.c')
-rw-r--r--builtin-show-branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index 4fa87f608..b9cf1b379 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] "))