aboutsummaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-04 01:28:46 -0700
committerJunio C Hamano <gitster@pobox.com>2007-11-04 01:28:46 -0700
commit140dd77a5cb2e61dcb942e245a2474fae95e42a5 (patch)
tree7403c48e96c005ce3b798566a925effd5528599a /builtin-log.c
parent02273fdbd07ddaa13a232db0ae63a720c4a013f0 (diff)
parentaacb8f10a70c07dfe1461684f098313f0edb371f (diff)
downloadgit-140dd77a5cb2e61dcb942e245a2474fae95e42a5.tar.gz
git-140dd77a5cb2e61dcb942e245a2474fae95e42a5.tar.xz
Merge branch 'jc/format-patch-encoding'
* jc/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-log.c')
-rw-r--r--builtin-log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-log.c b/builtin-log.c
index e8b982db7..8b2bf632c 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -787,7 +787,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
struct strbuf buf;
strbuf_init(&buf, 0);
pretty_print_commit(CMIT_FMT_ONELINE, commit,
- &buf, 0, NULL, NULL, 0);
+ &buf, 0, NULL, NULL, 0, 0);
printf("%c %s %s\n", sign,
sha1_to_hex(commit->object.sha1), buf.buf);
strbuf_release(&buf);