Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
diff: remove touched flags
author
Brandon Williams
<bmwill@google.com>
Tue, 31 Oct 2017 18:19:07 +0000
(11:19 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 1 Nov 2017 02:50:02 +0000
(11:50 +0900)
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>
builtin/log.c
patch
|
blob
|
history
diff.h
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
afa73c5
)
diff --git
a/builtin/log.c
b/builtin/log.c
index 82131751dd623d5dd6dd9aa0357e72037d2a6247..9c081527007b7b706fb02a6bfdfeae4290e2e24b 100644
(file)
--- 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);
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,
}
static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
diff --git
a/diff.h
b/diff.h
index d077d3c10cf5d83ad117420124bc78383084586a..26a1cab87fe10c80ba45f55e0c6bb0a90bd660e9 100644
(file)
--- 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_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)
#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;
const char *line_prefix;
size_t line_prefix_length;
struct diff_flags flags;
- struct diff_flags touched_flags;
/* diff-filter bits */
unsigned int filter;
/* diff-filter bits */
unsigned int filter;