* [PATCH 1/2] xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
@ 2016-03-04 23:09 Ramsay Jones
0 siblings, 0 replies; only message in thread
From: Ramsay Jones @ 2016-03-04 23:09 UTC (permalink / raw)
To: Junio C Hamano; +Cc: GIT Mailing-list
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>
---
xdiff/xprepare.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 63a22c6..5ffcf99 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;
--
2.7.0
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-03-04 23:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-04 23:09 [PATCH 1/2] xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits Ramsay Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).