summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-11-09 21:13:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-11-09 21:13:46 -0800
commit0d9d89f61c58f72d96585a61defb0634873c38ac (patch)
treefcb314481bb669dcf1f33ba3934786c1dcc51b12 /log-tree.c
parentMerge branch 'jk/terse-push' into aw/mirror-push (diff)
parentUpdate draft release notes for 1.5.4 (diff)
downloadtgif-0d9d89f61c58f72d96585a61defb0634873c38ac.tar.xz
Merge master into aw/mirror-push
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index 3763ce94fc..a34beb0b02 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -125,6 +125,18 @@ static unsigned int digits_in_number(unsigned int number)
return result;
}
+static int has_non_ascii(const char *s)
+{
+ int ch;
+ if (!s)
+ return 0;
+ while ((ch = *s++) != '\0') {
+ if (non_ascii(ch))
+ return 1;
+ }
+ return 0;
+}
+
void show_log(struct rev_info *opt, const char *sep)
{
struct strbuf msgbuf;
@@ -273,7 +285,8 @@ void show_log(struct rev_info *opt, const char *sep)
*/
strbuf_init(&msgbuf, 0);
pretty_print_commit(opt->commit_format, commit, &msgbuf,
- abbrev, subject, extra_headers, opt->date_mode);
+ abbrev, subject, extra_headers, opt->date_mode,
+ has_non_ascii(opt->add_signoff));
if (opt->add_signoff)
append_signoff(&msgbuf, opt->add_signoff);