Re* Consequences of CRLF in index?
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 27, 2017, 06:13 UTC
- Message-ID
- <xmqqinf1ce3i.fsf_-_@gitster.mtv.corp.google.com>
- In-Reply-To
- <xmqqy3nye9n8.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 6 quoted lines
> Stefan Beller <sbeller@google.com> writes: > >> (1<<5) is taken twice now. > > Good eyes. I think we use bits #1-#8 now (bit #0 is vacant, so are > #9-#31).
Let's do this bit-shuffling as a preliminary clean-up.
-- >8 -- Subject: [PATCH] xdiff: reassign xpparm_t.flags bits
We have packed the bits too tightly in such a way that it is not easy to add a new type of whitespace ignoring option, a new type of LCS algorithm, or a new type of post-cleanup heuristics.
Reorder bits a bit to give room for these three classes of options to grow.
While at it, add a comment in front of the bit definitions to clarify in which structure these defined bits may appear.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- xdiff/xdiff.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index b090ad8eac..457cac32d8 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -27,22 +27,24 @@ extern "C" { #endif /* #ifdef __cplusplus */ +/* xpparm_t.flags */ +#define XDF_NEED_MINIMAL (1 << 0) -#define XDF_NEED_MINIMAL (1 << 1) #define XDF_IGNORE_WHITESPACE (1 << 2) #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3) #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4) #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL) -#define XDF_PATIENCE_DIFF (1 << 5) -#define XDF_HISTOGRAM_DIFF (1 << 6) +#define XDF_IGNORE_BLANK_LINES (1 << 7) + +#define XDF_PATIENCE_DIFF (1 << 14) +#define XDF_HISTOGRAM_DIFF (1 << 15) #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF) #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK) -#define XDF_IGNORE_BLANK_LINES (1 << 7) - -#define XDF_INDENT_HEURISTIC (1 << 8) +#define XDF_INDENT_HEURISTIC (1 << 23) +/* xdemitconf_t.flags */ #define XDL_EMIT_FUNCNAMES (1 << 0) #define XDL_EMIT_FUNCCONTEXT (1 << 2)
-- 2.15.0-rc2-266-g8f92d095f4