diff --git a/builtin-log.c b/builtin-log.c
index bbadbc0de2fe1a2c85f3488420172a4db2ab6b4a..fe8fc6f22a176a017c65ac6177f0bab890d8fce5 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
strbuf_release(&sb);
shortlog_init(&log);
+ log.wrap_lines = 1;
+ log.wrap = 72;
+ log.in1 = 2;
+ log.in2 = 4;
for (i = 0; i < nr; i++)
shortlog_add_commit(&log, list[i]);
if (!origin)
return;
- diff_setup(&opts);
- opts.output_format |= DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
+ memcpy(&opts, &rev->diffopt, sizeof(opts));
+ opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
diff_setup_done(&opts);