diff: remove touched flags

Now that the set of parallel touched flags are no longer being used,
remove them.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2017-10-31 11:19:07 -07:00 committed by Junio C Hamano
parent afa73c5384
commit 25567af805
2 changed files with 2 additions and 6 deletions

View file

@ -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,

6
diff.h
View file

@ -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;