From: Lars Schneider Date: Wed, 28 Jun 2017 21:29:50 +0000 (+0200) Subject: convert: put the flags field before the flag itself for consistent style X-Git-Tag: v2.15.0-rc0~200^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/42b0a86c0ed90d48c2df510e3b26b9bd007ec0a4?ds=sidebyside;hp=1757333410177e2b783fa8b29cf116bd6171c5bb convert: put the flags field before the flag itself for consistent style Suggested-by: Jeff King Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- diff --git a/convert.c b/convert.c index f1e168bc30..9907e3b9ba 100644 --- a/convert.c +++ b/convert.c @@ -597,12 +597,12 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len } process = &entry->subprocess.process; - if (!(wanted_capability & entry->supported_capabilities)) + if (!(entry->supported_capabilities & wanted_capability)) return 0; - if (CAP_CLEAN & wanted_capability) + if (wanted_capability & CAP_CLEAN) filter_type = "clean"; - else if (CAP_SMUDGE & wanted_capability) + else if (wanted_capability & CAP_SMUDGE) filter_type = "smudge"; else die("unexpected filter type"); @@ -703,9 +703,9 @@ static int apply_filter(const char *path, const char *src, size_t len, if (!dst) return 1; - if ((CAP_CLEAN & wanted_capability) && !drv->process && drv->clean) + if ((wanted_capability & CAP_CLEAN) && !drv->process && drv->clean) cmd = drv->clean; - else if ((CAP_SMUDGE & wanted_capability) && !drv->process && drv->smudge) + else if ((wanted_capability & CAP_SMUDGE) && !drv->process && drv->smudge) cmd = drv->smudge; if (cmd && *cmd)