Changes in v3: * Now always pass struct diff_flags by reference and don't return the struct but rather modify the passed in struct. * Don't clear TEXTCONV_SET_VIA_CMDLINE when --no-textconv is passed * added additional patches (set out separately before) to remove the macros and change the struct members to lowercase Brandon Williams (8): add, reset: use DIFF_OPT_SET macro to set a diff flag diff: convert flags to be stored in bitfields diff: add flag to indicate textconv was set via cmdline diff: remove touched flags diff: remove DIFF_OPT_TST macro diff: remove DIFF_OPT_SET macro diff: remove DIFF_OPT_CLR macro diff: make struct diff_flags members lowercase blame.c | 16 ++--- builtin/add.c | 4 +- builtin/am.c | 10 +-- builtin/blame.c | 10 +-- builtin/commit.c | 7 +- builtin/diff.c | 8 +-- builtin/fast-export.c | 2 +- builtin/log.c | 27 ++++---- builtin/reset.c | 2 +- builtin/rev-list.c | 2 +- combine-diff.c | 10 +-- diff-lib.c | 30 +++++---- diff-no-index.c | 8 +-- diff.c | 175 +++++++++++++++++++++++++------------------------- diff.h | 88 ++++++++++++++----------- diffcore-pickaxe.c | 8 +-- diffcore-rename.c | 6 +- log-tree.c | 2 +- merge-recursive.c | 4 +- notes-merge.c | 4 +- patch-ids.c | 2 +- revision.c | 24 +++---- sequencer.c | 5 +- submodule.c | 16 ++--- tree-diff.c | 16 ++--- wt-status.c | 18 +++--- 26 files changed, 259 insertions(+), 245 deletions(-) -- 2.15.0.403.gc27cc4dac6-goog
