aboutsummaryrefslogtreecommitdiff
path: root/builtin-branch.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-branch.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-branch.c')
-rw-r--r--builtin-branch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c
index fbd90e42d..3bf40f145 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -282,7 +282,7 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
commit = lookup_commit(item->sha1);
if (commit && !parse_commit(commit)) {
pretty_print_commit(CMIT_FMT_ONELINE, commit,
- &subject, 0, NULL, NULL, 0);
+ &subject, 0, NULL, NULL, 0, 0);
sub = subject.buf;
}
printf("%c %s%-*s%s %s %s\n", c, branch_get_color(color),