Browse Source

Remove dead code: show_log() sep argument and diff_options.msg_sep

These variables were made unnecessary by commit
3969cf7db1.

Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Adam Simpkins 17 years ago committed by Junio C Hamano
parent
commit
028656552b
  1. 1
      builtin-log.c
  2. 6
      combine-diff.c
  3. 1
      diff.c
  4. 1
      diff.h
  5. 27
      log-tree.c
  6. 2
      log-tree.h

1
builtin-log.c

@ -770,7 +770,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) @@ -770,7 +770,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
rev.diff = 1;
rev.combine_merges = 0;
rev.ignore_merges = 1;
rev.diffopt.msg_sep = "";
DIFF_OPT_SET(&rev.diffopt, RECURSIVE);

rev.subject_prefix = fmt_patch_subject_prefix;

6
combine-diff.c

@ -798,7 +798,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, @@ -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 @@ -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, @@ -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);
}

1
diff.c

@ -2220,7 +2220,6 @@ void diff_setup(struct diff_options *options) @@ -2220,7 +2220,6 @@ void diff_setup(struct diff_options *options)
options->rename_limit = -1;
options->dirstat_percent = 3;
options->context = 3;
options->msg_sep = "";

options->change = diff_change;
options->add_remove = diff_addremove;

1
diff.h

@ -88,7 +88,6 @@ struct diff_options { @@ -88,7 +88,6 @@ struct diff_options {
int abbrev;
const char *prefix;
int prefix_length;
const char *msg_sep;
const char *stat_sep;
long xdl_opts;


27
log-tree.c

@ -208,14 +208,13 @@ void log_write_email_headers(struct rev_info *opt, const char *name, @@ -208,14 +208,13 @@ void log_write_email_headers(struct rev_info *opt, const char *name,
*extra_headers_p = extra_headers;
}

void show_log(struct rev_info *opt, const char *sep)
void show_log(struct rev_info *opt)
{
struct strbuf msgbuf;
struct log_info *log = opt->loginfo;
struct commit *commit = log->commit, *parent = log->parent;
int abbrev = opt->diffopt.abbrev;
int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
const char *extra;
const char *subject = NULL, *extra_headers = opt->extra_headers;
int need_8bit_cte = 0;

@ -240,17 +239,10 @@ void show_log(struct rev_info *opt, const char *sep) @@ -240,17 +239,10 @@ void show_log(struct rev_info *opt, const char *sep)
}

/*
* The "oneline" format has several special cases:
* - The pretty-printed commit lacks a newline at the end
* of the buffer, but we do want to make sure that we
* have a newline there. If the separator isn't already
* a newline, add an extra one.
* - unlike other log messages, the one-line format does
* not have an empty line between entries.
* If use_terminator is set, add a newline at the end of the entry.
* Otherwise, add a diffopt.line_termination character before all
* entries but the first. (IOW, as a separator between entries)
*/
extra = "";
if (*sep != '\n' && opt->use_terminator)
extra = "\n";
if (opt->shown_one && !opt->use_terminator)
putchar(opt->diffopt.line_termination);
opt->shown_one = 1;
@ -292,10 +284,8 @@ void show_log(struct rev_info *opt, const char *sep) @@ -292,10 +284,8 @@ void show_log(struct rev_info *opt, const char *sep)
show_reflog_message(opt->reflog_info,
opt->commit_format == CMIT_FMT_ONELINE,
opt->date_mode);
if (opt->commit_format == CMIT_FMT_ONELINE) {
printf("%s", sep);
if (opt->commit_format == CMIT_FMT_ONELINE)
return;
}
}
}

@ -319,7 +309,8 @@ void show_log(struct rev_info *opt, const char *sep) @@ -319,7 +309,8 @@ void show_log(struct rev_info *opt, const char *sep)

if (msgbuf.len) {
fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
printf("%s%s", extra, sep);
if (opt->use_terminator)
putchar('\n');
}
strbuf_release(&msgbuf);
}
@ -342,7 +333,7 @@ int log_tree_diff_flush(struct rev_info *opt) @@ -342,7 +333,7 @@ int log_tree_diff_flush(struct rev_info *opt)
* an extra newline between the end of log and the
* output for readability.
*/
show_log(opt, opt->diffopt.msg_sep);
show_log(opt);
if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
opt->verbose_header &&
opt->commit_format != CMIT_FMT_ONELINE) {
@ -430,7 +421,7 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit) @@ -430,7 +421,7 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
shown = log_tree_diff(opt, commit, &log);
if (!shown && opt->loginfo && opt->always_show_header) {
log.parent = NULL;
show_log(opt, "");
show_log(opt);
shown = 1;
}
opt->loginfo = NULL;

2
log-tree.h

@ -11,7 +11,7 @@ void init_log_tree_opt(struct rev_info *); @@ -11,7 +11,7 @@ void init_log_tree_opt(struct rev_info *);
int log_tree_diff_flush(struct rev_info *);
int log_tree_commit(struct rev_info *, struct commit *);
int log_tree_opt_parse(struct rev_info *, const char **, int);
void show_log(struct rev_info *opt, const char *sep);
void show_log(struct rev_info *opt);
void show_decorations(struct commit *commit);
void log_write_email_headers(struct rev_info *opt, const char *name,
const char **subject_p,

Loading…
Cancel
Save