diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-19 15:36:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-19 15:36:55 -0800 |
| commit | 307ab20b333d9b4c818b1ff912e86944d1a3fdc1 (patch) | |
| tree | f12359319e8af782f8c2f31ca811643ec38213f0 /xdiff/xhistogram.c | |
| parent | e5b06629de847663aaf0f7daae8de81338da3901 (diff) | |
| download | git-307ab20b333d9b4c818b1ff912e86944d1a3fdc1.tar.gz | |
xdiff: PATIENCE/HISTOGRAM are not independent option bitsjc/diff-algo-cleanup
Because the default Myers, patience and histogram algorithms cannot be in
effect at the same time, XDL_PATIENCE_DIFF and XDL_HISTOGRAM_DIFF are not
independent bits. Instead of wasting one bit per algorithm, define a few
macros to access the few bits they occupy and update the code that access
them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xhistogram.c')
| -rw-r--r-- | xdiff/xhistogram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c index 18f6f997c3..bf99787c3e 100644 --- a/xdiff/xhistogram.c +++ b/xdiff/xhistogram.c @@ -252,7 +252,7 @@ static int fall_back_to_classic_diff(struct histindex *index, int line1, int count1, int line2, int count2) { xpparam_t xpp; - xpp.flags = index->xpp->flags & ~XDF_HISTOGRAM_DIFF; + xpp.flags = index->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK; return xdl_fall_back_diff(index->env, &xpp, line1, count1, line2, count2); |