diff options
| author | Ramsay Jones <ramsay@ramsayjones.plus.com> | 2016-03-04 23:09:36 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-04 15:51:06 -0800 |
| commit | 5cd6978a9cfef58de061a9525f3678ade479564d (patch) | |
| tree | b2a67a991303f9b87cacf2c7bf9b0d142a4e9f52 /xdiff | |
| parent | a2558fb8e1e387b630312311e1d22c95663da5d0 (diff) | |
| download | git-5cd6978a9cfef58de061a9525f3678ade479564d.tar.gz | |
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
Commit 307ab20b3 ("xdiff: PATIENCE/HISTOGRAM are not independent option
bits", 19-02-2012) introduced the XDF_DIFF_ALG() macro to access the
flag bits used to represent the diff algorithm requested. In addition,
code which had used explicit manipulation of the flag bits was changed
to use the macros.
However, one example of direct manipulation remains. Update this code to
use the XDF_DIFF_ALG() macro.
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xprepare.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c index 63a22c630e..5ffcf996f0 100644 --- a/xdiff/xprepare.c +++ b/xdiff/xprepare.c @@ -304,7 +304,7 @@ int xdl_prepare_env(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, return -1; } - if (!(xpp->flags & XDF_HISTOGRAM_DIFF)) + if (XDF_DIFF_ALG(xpp->flags) != XDF_HISTOGRAM_DIFF) xdl_free_classifier(&cf); return 0; |