diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2017-06-28 23:29:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-29 20:23:47 +0200 |
| commit | 42b0a86c0ed90d48c2df510e3b26b9bd007ec0a4 (patch) | |
| tree | 77c5b2e9a849783d427cced5de264d6d9a3a7890 /convert.c | |
| parent | t0021: write "OUT <size>" only on success (diff) | |
| download | git-42b0a86c0ed90d48c2df510e3b26b9bd007ec0a4.tar.xz git-42b0a86c0ed90d48c2df510e3b26b9bd007ec0a4.zip | |
convert: put the flags field before the flag itself for consistent style
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
| -rw-r--r-- | convert.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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) |