From 25567af8056d992c9a51815db4b3a3e9417a2969 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 31 Oct 2017 11:19:07 -0700 Subject: [PATCH] diff: remove touched flags Now that the set of parallel touched flags are no longer being used, remove them. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano --- builtin/log.c | 2 -- diff.h | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 82131751dd..9c08152700 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -134,8 +134,6 @@ static void cmd_log_init_defaults(struct rev_info *rev) if (default_date_mode) parse_date_format(default_date_mode, &rev->date_mode); - - memset(&rev->diffopt.touched_flags, 0, sizeof(struct diff_flags)); } static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, diff --git a/diff.h b/diff.h index d077d3c10c..26a1cab87f 100644 --- a/diff.h +++ b/diff.h @@ -107,9 +107,8 @@ static inline void diff_flags_or(struct diff_flags *a, } #define DIFF_OPT_TST(opts, flag) ((opts)->flags.flag) -#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags.flag) -#define DIFF_OPT_SET(opts, flag) (((opts)->flags.flag = 1),((opts)->touched_flags.flag = 1)) -#define DIFF_OPT_CLR(opts, flag) (((opts)->flags.flag = 0),((opts)->touched_flags.flag = 1)) +#define DIFF_OPT_SET(opts, flag) ((opts)->flags.flag = 1) +#define DIFF_OPT_CLR(opts, flag) ((opts)->flags.flag = 0) #define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag) #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag) @@ -138,7 +137,6 @@ struct diff_options { const char *line_prefix; size_t line_prefix_length; struct diff_flags flags; - struct diff_flags touched_flags; /* diff-filter bits */ unsigned int filter; -- 2.11.4.GIT