kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

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>
maint
Lars Schneider 8 years ago committed by Junio C Hamano
parent
1757333410
commit
42b0a86c0e
1 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      convert.c

10
convert.c
Unescape View File

@ -597,12 +597,12 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
} }
process = &entry->subprocess.process; process = &entry->subprocess.process;


if (!(wanted_capability & entry->supported_capabilities)) if (!(entry->supported_capabilities & wanted_capability))
return 0; return 0;


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


if ((CAP_CLEAN & wanted_capability) && !drv->process && drv->clean) if ((wanted_capability & CAP_CLEAN) && !drv->process && drv->clean)
cmd = 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; cmd = drv->smudge;


if (cmd && *cmd) if (cmd && *cmd)

Write Preview
Loading…
Cancel
Save