Call init_revisions() first to prepare the revision traversal parameters and pass it to git_log_config(), so that necessary bits in the traversal parameters can be tweaked before we call the command line parsing infrastructure setup_revisions() from the cmd_log_init_finish() function. Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- * This is made separate from the next one that touches the contents of "rev" to make sure the existing code does not depend on the current initialization order. I do not think it does but better be careful to keep the history easier to bisect, than be sorry when an issue does appear. builtin/log.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 09cf43e..07a0078 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -360,9 +360,8 @@ int cmd_whatchanged(int argc, const char **argv, const char *prefix) struct rev_info rev; struct setup_revision_opt opt; - git_config(git_log_config, NULL); - init_revisions(&rev, prefix); + git_config(git_log_config, &rev); rev.diff = 1; rev.simplify_history = 0; memset(&opt, 0, sizeof(opt)); @@ -450,10 +449,9 @@ int cmd_show(int argc, const char **argv, const char *prefix) struct pathspec match_all; int i, count, ret = 0; - git_config(git_log_config, NULL); - init_pathspec(&match_all, NULL); init_revisions(&rev, prefix); + git_config(git_log_config, &rev); rev.diff = 1; rev.always_show_header = 1; rev.no_walk = REVISION_WALK_NO_WALK_SORTED; @@ -530,9 +528,8 @@ int cmd_log_reflog(int argc, const char **argv, const char *prefix) struct rev_info rev; struct setup_revision_opt opt; - git_config(git_log_config, NULL); - init_revisions(&rev, prefix); + git_config(git_log_config, &rev); init_reflog_walk(&rev.reflog_info); rev.verbose_header = 1; memset(&opt, 0, sizeof(opt)); @@ -552,9 +549,8 @@ int cmd_log(int argc, const char **argv, const char *prefix) struct rev_info rev; struct setup_revision_opt opt; - git_config(git_log_config, NULL); - init_revisions(&rev, prefix); + git_config(git_log_config, &rev); rev.always_show_header = 1; memset(&opt, 0, sizeof(opt)); opt.def = "HEAD"; @@ -1121,8 +1117,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) extra_hdr.strdup_strings = 1; extra_to.strdup_strings = 1; extra_cc.strdup_strings = 1; - git_config(git_format_config, NULL); init_revisions(&rev, prefix); + git_config(git_format_config, &rev); rev.commit_format = CMIT_FMT_EMAIL; rev.verbose_header = 1; rev.diff = 1; -- 1.8.0.rc0.57.g712528f -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html