diff options
| -rw-r--r-- | builtin/diff-tree.c | 2 | ||||
| -rw-r--r-- | builtin/log.c | 6 | ||||
| -rw-r--r-- | revision.c | 2 | ||||
| -rw-r--r-- | revision.h | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index d62caa6c8b..c9ba35f143 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -99,7 +99,7 @@ static const char diff_tree_usage[] = " --root include the initial commit as diff against /dev/null\n" COMMON_DIFF_OPTIONS_HELP; -static void diff_tree_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt) +static void diff_tree_tweak_rev(struct rev_info *rev) { if (!rev->diffopt.output_format) { if (rev->dense_combined_merges) diff --git a/builtin/log.c b/builtin/log.c index 1aca560ec3..96b60c1610 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -719,8 +719,7 @@ static int show_tree_object(const struct object_id *oid UNUSED, return 0; } -static void show_setup_revisions_tweak(struct rev_info *rev, - struct setup_revision_opt *opt) +static void show_setup_revisions_tweak(struct rev_info *rev) { if (rev->first_parent_only) diff_merges_default_to_first_parent(rev); @@ -863,8 +862,7 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix) return cmd_log_deinit(cmd_log_walk(&rev), &rev); } -static void log_setup_revisions_tweak(struct rev_info *rev, - struct setup_revision_opt *opt) +static void log_setup_revisions_tweak(struct rev_info *rev) { if (rev->diffopt.flags.default_follow_renames && diff_check_follow_pathspec(&rev->prune_data, 0)) diff --git a/revision.c b/revision.c index d66857ecc0..ea5ab59654 100644 --- a/revision.c +++ b/revision.c @@ -2971,7 +2971,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (!revs->def) revs->def = opt ? opt->def : NULL; if (opt && opt->tweak) - opt->tweak(revs, opt); + opt->tweak(revs); if (revs->show_merge) prepare_show_merge(revs); if (revs->def && !revs->pending.nr && !revs->rev_input_given) { diff --git a/revision.h b/revision.h index 25776af381..18f49565c2 100644 --- a/revision.h +++ b/revision.h @@ -428,7 +428,7 @@ void repo_init_revisions(struct repository *r, */ struct setup_revision_opt { const char *def; - void (*tweak)(struct rev_info *, struct setup_revision_opt *); + void (*tweak)(struct rev_info *); unsigned int assume_dashdash:1, allow_exclude_promisor_objects:1, free_removed_argv_elements:1; |