From: Lars Schneider <larsxschneider@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, peff@peff.net, tboegi@web.de, e@80x24.org,
ttaylorr@github.com, peartben@gmail.com
Subject: [PATCH v9 4/7] convert: put the flags field before the flag itself for consistent style
Date: Fri, 30 Jun 2017 22:41:25 +0200 [thread overview]
Message-ID: <20170630204128.48708-5-larsxschneider@gmail.com> (raw)
In-Reply-To: <20170630204128.48708-1-larsxschneider@gmail.com>
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
convert.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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)
--
2.13.2
next prev parent reply other threads:[~2017-06-30 20:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-30 20:41 [PATCH v9 0/7] convert: add "status=delayed" to filter process protocol Lars Schneider
2017-06-30 20:41 ` [PATCH v9 1/7] t0021: keep filter log files on comparison Lars Schneider
2017-06-30 20:41 ` [PATCH v9 2/7] t0021: make debug log file name configurable Lars Schneider
2017-06-30 20:41 ` [PATCH v9 3/7] t0021: write "OUT <size>" only on success Lars Schneider
2017-06-30 20:41 ` Lars Schneider [this message]
2017-06-30 20:41 ` [PATCH v9 5/7] convert: move multiple file filter error handling to separate function Lars Schneider
2017-06-30 20:41 ` [PATCH v9 6/7] convert: refactor capabilities negotiation Lars Schneider
2017-06-30 20:41 ` [PATCH v9 7/7] convert: add "status=delayed" to filter process protocol Lars Schneider
2017-06-30 21:30 ` [PATCH v9 0/7] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170630204128.48708-5-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peartben@gmail.com \
--cc=peff@peff.net \
--cc=tboegi@web.de \
--cc=ttaylorr@github.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).