diff options
| author | Brandon Williams <bmwill@google.com> | 2017-10-31 18:19:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-01 02:50:02 (GMT) |
| commit | 02f2f56bc377c287c411947d0e1482aac888f8db (patch) | |
| tree | e03063fbe94146e5adfe73bb072c5aeeb60a9685 /diff.c | |
| parent | c9f348e926d300c4e254299b92e9bfe1678512d6 (diff) | |
| download | git-02f2f56bc377c287c411947d0e1482aac888f8db.zip git-02f2f56bc377c287c411947d0e1482aac888f8db.tar.gz git-02f2f56bc377c287c411947d0e1482aac888f8db.tar.bz2 | |
diff: convert flags to be stored in bitfields
We cannot add many more flags to the diff machinery due to the
limitations of the number of flags that can be stored in a single
unsigned int. In order to allow for more flags to be added to the diff
machinery in the future this patch converts the flags to be stored in
bitfields in 'struct diff_flags'.
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5899,7 +5899,7 @@ int diff_can_quit_early(struct diff_options *opt) static int is_submodule_ignored(const char *path, struct diff_options *options) { int ignored = 0; - unsigned orig_flags = options->flags; + struct diff_flags orig_flags = options->flags; if (!DIFF_OPT_TST(options, OVERRIDE_SUBMODULE_CONFIG)) set_diffopt_flags_from_submodule_config(options, path); if (DIFF_OPT_TST(options, IGNORE_SUBMODULES)) |