Skip to content

convert diff flags to be stored in a struct

Brandon Williams git 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest8 patches 7 repliesIn review
  2. v24 patches 9 repliesSuperseded
  3. v13 patches 9 repliesSuperseded

Changes in v3 from the cover letter

* 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

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8add, reset: use DIFF_OPT_SET macro to set a diff flagbuiltin/add.c builtin/reset.c+2 -20 replies
2/8diff: convert flags to be stored in bitfieldsbuiltin/commit.c builtin/log.c diff-lib.c +3 more+68 -493 replies
3/8diff: add flag to indicate textconv was set via cmdlinebuiltin/log.c diff.c diff.h+5 -30 replies
4/8diff: remove touched flagsbuiltin/log.c diff.h+2 -60 replies
5/8diff: remove DIFF_OPT_TST macroblame.c builtin/am.c builtin/blame.c +14 more+84 -840 replies
6/8diff: remove DIFF_OPT_SET macroblame.c builtin/add.c builtin/am.c +17 more+90 -910 replies
7/8diff: remove DIFF_OPT_CLR macrobuiltin/blame.c combine-diff.c diff.c +4 more+22 -242 replies
8/8diff: make struct diff_flags members lowercaseblame.c builtin/add.c builtin/am.c +22 more+228 -2280 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 0/8] convert diff flags to be stored in a struct

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(-)
Signature · 1 line
2.15.0.403.gc27cc4dac6-goog