Skip to content

Commit 42b0a86

Browse files
larsxschneidergitster
authored andcommitted
convert: put the flags field before the flag itself for consistent style
Suggested-by: Jeff King <[email protected]> Signed-off-by: Lars Schneider <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1757333 commit 42b0a86

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

convert.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -597,12 +597,12 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
597597
}
598598
process = &entry->subprocess.process;
599599

600-
if (!(wanted_capability & entry->supported_capabilities))
600+
if (!(entry->supported_capabilities & wanted_capability))
601601
return 0;
602602

603-
if (CAP_CLEAN & wanted_capability)
603+
if (wanted_capability & CAP_CLEAN)
604604
filter_type = "clean";
605-
else if (CAP_SMUDGE & wanted_capability)
605+
else if (wanted_capability & CAP_SMUDGE)
606606
filter_type = "smudge";
607607
else
608608
die("unexpected filter type");
@@ -703,9 +703,9 @@ static int apply_filter(const char *path, const char *src, size_t len,
703703
if (!dst)
704704
return 1;
705705

706-
if ((CAP_CLEAN & wanted_capability) && !drv->process && drv->clean)
706+
if ((wanted_capability & CAP_CLEAN) && !drv->process && drv->clean)
707707
cmd = drv->clean;
708-
else if ((CAP_SMUDGE & wanted_capability) && !drv->process && drv->smudge)
708+
else if ((wanted_capability & CAP_SMUDGE) && !drv->process && drv->smudge)
709709
cmd = drv->smudge;
710710

711711
if (cmd && *cmd)

0 commit comments

Comments
 (0)