summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-10-31 11:19:07 -0700
committerJunio C Hamano <gitster@pobox.com>2017-11-01 11:50:02 +0900
commit25567af8056d992c9a51815db4b3a3e9417a2969 (patch)
tree0dba2deb9b43c3988aff8209172996e9d8d1bf7a /diff.h
parentafa73c5384de1d01386e57bd575257d1420aeb21 (diff)
downloadgit-25567af8056d992c9a51815db4b3a3e9417a2969.tar.gz
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>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h6
1 files changed, 2 insertions, 4 deletions
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;