path: root/builtin/log.c
diff options
authorJunio C Hamano <>2013-05-10 15:10:11 (GMT)
committerJunio C Hamano <>2013-05-10 17:24:17 (GMT)
commit6c374008b1a4e3b66469168aace47003e9771e2d (patch)
tree8707e3249bb3398b6231423d7e6784eb3a048881 /builtin/log.c
parent4bd52d0956f5ba2a922968057cabd77a98f6da5c (diff)
diff_opt: track whether flags have been set explicitly
The diff_opt infrastructure sets flags based on defaults and command line options. It is impossible to tell whether a flag has been set as a default or on explicit request. Update the structure so that this detection is possible: * Add an extra "opt->touched_flags" that keeps track of all the fields that have been touched by DIFF_OPT_SET and DIFF_OPT_CLR. * You may continue setting the default values to the flags, like commands in the "log" family do in cmd_log_init_defaults(), but after you finished setting the defaults, you clear the touched_flags field; * And then you let the usual callchain call diff_opt_parse(), allowing the opt->flags be set or unset, while keeping track of which bits the user touched; * There is an optional callback "opt->set_default" that is called at the very beginning to let you inspect touched_flags and update opt->flags appropriately, before the remainder of the diffcore machinery is set up, taking the opt->flags value into account. Signed-off-by: Michael J Gruber <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/log.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/log.c b/builtin/log.c
index ad46f72..3abbc66 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -91,6 +91,7 @@ static void cmd_log_init_defaults(struct rev_info *rev)
if (default_date_mode)
rev->date_mode = parse_date_format(default_date_mode);
+ rev->diffopt.touched_flags = 0;
static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,