[PATCH v3 2/5] log: honor log.merges= option
- From
- Koosha Khajehmoogahi <koosha@posteo.de>
- Date
- Apr 13, 2015, 15:29 UTC
- Message-ID
- <1428938968-19013-2-git-send-email-koosha@posteo.de>
- In-Reply-To
- <1428938968-19013-1-git-send-email-koosha@posteo.de>
From: Junio C Hamano <gitster@pobox.com>
The config. variable is honored only by log. Other log family commands including show, shortlog and rev-list are affected only from the equivalent command line option (i.e. --merges=). Since these commands are somehow different representations of log command, we like to have the same behavior from them as we do from log itself. However, to not break the default output of them, we do not consider the the config. var. Other log-family commands format-patch and cherry ignore the option altogether (i.e. both on command line and on config settings).
[kk: wrote commit message]
Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Koosha Khajehmoogahi <koosha@posteo.de> --- builtin/log.c | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/builtin/log.c b/builtin/log.c index dd8f3fc..c7a7aad 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -36,6 +36,7 @@ static int decoration_given; static int use_mailmap_config; static const char *fmt_patch_subject_prefix = "PATCH"; static const char *fmt_pretty; +static const char *log_merges; static const char * const builtin_log_usage[] = { N_("git log [<options>] [<revision range>] [[--] <path>...]"), @@ -386,6 +387,9 @@ static int git_log_config(const char *var, const char *value, void *cb) decoration_style = 0; /* maybe warn? */ return 0; } + if (!strcmp(var, "log.merges")) { + return git_config_string(&log_merges, var, value); + } if (!strcmp(var, "log.showroot")) { default_show_root = git_config_bool(var, value); return 0; @@ -628,6 +632,8 @@ int cmd_log(int argc, const char **argv, const char *prefix) init_revisions(&rev, prefix); rev.always_show_header = 1; + if (log_merges && parse_merges_opt(&rev, log_merges)) + die("unknown config value for log.merges: %s", log_merges); memset(&opt, 0, sizeof(opt)); opt.def = "HEAD"; opt.revarg_opt = REVARG_COMMITTISH;
-- 2.3.3.263.g095251d.dirty