aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorAdam Simpkins <adam@adamsimpkins.net>2008-04-29 01:32:59 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-03 11:48:03 -0700
commit028656552bc758b192027c25a1143f1c6ca66d64 (patch)
treec830540314b3c3f28b36bfbef66c38233487533e /combine-diff.c
parentabfa533dea28763040beba3e3d908bbbcf818b3a (diff)
downloadgit-028656552bc758b192027c25a1143f1c6ca66d64.tar.gz
git-028656552bc758b192027c25a1143f1c6ca66d64.tar.xz
Remove dead code: show_log() sep argument and diff_options.msg_sep
These variables were made unnecessary by commit 3969cf7db1a13a78f3b7a36d8c1084bbe0a53459. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/combine-diff.c b/combine-diff.c
index f1e7a4d5d..41aaf83dd 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -798,7 +798,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
int deleted = 0;
if (rev->loginfo && !rev->no_commit_id)
- show_log(rev, opt->msg_sep);
+ show_log(rev);
dump_quoted_path(dense ? "diff --cc " : "diff --combined ",
"", elem->path, c_meta, c_reset);
printf("%sindex ", c_meta);
@@ -881,7 +881,7 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re
inter_name_termination = 0;
if (rev->loginfo && !rev->no_commit_id)
- show_log(rev, opt->msg_sep);
+ show_log(rev);
if (opt->output_format & DIFF_FORMAT_RAW) {
offset = strlen(COLONS) - num_parent;
@@ -962,7 +962,7 @@ void diff_tree_combined(const unsigned char *sha1,
paths = intersect_paths(paths, i, num_parent);
if (show_log_first && i == 0) {
- show_log(rev, opt->msg_sep);
+ show_log(rev);
if (rev->verbose_header && opt->output_format)
putchar(opt->line_termination);
}