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>
Brandon Williams committed
Oct 31, 2017 at 11:19 UTC
25567af8056d992c9a51815db4b3a3e9417a2969
2 files changed
+2
-6
builtin/log.c
-2
@@ -134,8 +134,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)
134
135
if (default_date_mode)
136
parse_date_format(default_date_mode, &rev->date_mode);
137
-
138
- memset(&rev->diffopt.touched_flags, 0, sizeof(struct diff_flags));
137
}
138
139
static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
diff.h
+2
-4
@@ -107,9 +107,8 @@ static inline void diff_flags_or(struct diff_flags *a,
107
}
108
109
#define DIFF_OPT_TST(opts, flag) ((opts)->flags.flag)
110
-#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags.flag)
111
-#define DIFF_OPT_SET(opts, flag) (((opts)->flags.flag = 1),((opts)->touched_flags.flag = 1))
112
-#define DIFF_OPT_CLR(opts, flag) (((opts)->flags.flag = 0),((opts)->touched_flags.flag = 1))
110
+#define DIFF_OPT_SET(opts, flag) ((opts)->flags.flag = 1)
111
+#define DIFF_OPT_CLR(opts, flag) ((opts)->flags.flag = 0)
112
113
#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
114
#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
@@ -138,7 +137,6 @@ struct diff_options {
137
const char *line_prefix;
138
size_t line_prefix_length;
139
struct diff_flags flags;
141
- struct diff_flags touched_flags;
140
141
/* diff-filter bits */
142
unsigned int filter;