From: Joey Hess <joeyh@joeyh.name>
To: git@vger.kernel.org
Cc: Joey Hess <joeyh@joeyh.name>
Subject: [PATCH v5 5/8] warn on unusable smudgeToFile/cleanFromFile config
Date: Mon, 11 Jul 2016 18:45:09 -0400 [thread overview]
Message-ID: <1468277112-9909-6-git-send-email-joeyh@joeyh.name> (raw)
In-Reply-To: <1468277112-9909-1-git-send-email-joeyh@joeyh.name>
Let the user know when they have a smudgeToFile/cleanFromFile config
that cannot be used because the corresponding smudge/clean config
is missing.
The warning is only displayed a maximum of once per git invocation,
and only when doing an operation that would use the filter.
Signed-off-by: Joey Hess <joeyh@joeyh.name>
---
convert.c | 36 ++++++++++++++++++++++++++----------
1 file changed, 26 insertions(+), 10 deletions(-)
diff --git a/convert.c b/convert.c
index eb7774f..e1b0b44 100644
--- a/convert.c
+++ b/convert.c
@@ -845,34 +845,50 @@ int would_convert_to_git_filter_fd(const char *path)
return apply_filter(path, NULL, NULL, 0, -1, NULL, ca.drv->clean);
}
+static int can_filter_file(const char *filefilter, const char *filefiltername,
+ const char *stdiofilter, const char *stdiofiltername,
+ const struct conv_attrs *ca,
+ int *warncount)
+{
+ if (!filefilter)
+ return 0;
+
+ if (stdiofilter)
+ return 1;
+
+ if (*warncount == 0)
+ warning("Not running your configured filter.%s.%s command, because filter.%s.%s is not configured",
+ ca->drv->name, filefiltername,
+ ca->drv->name, stdiofiltername);
+ *warncount=*warncount+1;
+
+ return 0;
+}
+
int can_clean_from_file(const char *path)
{
struct conv_attrs ca;
+ static int warncount = 0;
convert_attrs(&ca, path);
if (!ca.drv)
return 0;
- /*
- * Only use the cleanFromFile filter when the clean filter is also
- * configured.
- */
- return (ca.drv->clean_from_file && ca.drv->clean);
+ return can_filter_file(ca.drv->clean_from_file, "cleanFromFile",
+ ca.drv->clean, "clean", &ca, &warncount);
}
int can_smudge_to_file(const char *path)
{
struct conv_attrs ca;
+ static int warncount = 0;
convert_attrs(&ca, path);
if (!ca.drv)
return 0;
- /*
- * Only use the smudgeToFile filter when the smudge filter is also
- * configured.
- */
- return (ca.drv->smudge_to_file && ca.drv->smudge);
+ return can_filter_file(ca.drv->smudge_to_file, "smudgeToFile",
+ ca.drv->smudge, "smudge", &ca, &warncount);
}
const char *get_convert_attr_ascii(const char *path)
--
2.8.1
next prev parent reply other threads:[~2016-07-11 22:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-11 22:45 [PATCH v5 0/8] extend smudge/clean filters with direct file access (for pu) Joey Hess
2016-07-11 22:45 ` [PATCH v5 1/8] clarify %f documentation Joey Hess
2016-07-11 22:45 ` [PATCH v5 2/8] add smudgeToFile and cleanFromFile filter configs Joey Hess
2016-07-13 16:02 ` Lars Schneider
2016-07-11 22:45 ` [PATCH v5 3/8] use cleanFromFile in git add Joey Hess
2016-07-11 22:45 ` [PATCH v5 4/8] use smudgeToFile in git checkout etc Joey Hess
2016-07-11 22:45 ` Joey Hess [this message]
2016-07-11 22:45 ` [PATCH v5 6/8] better recovery from failure of smudgeToFile filter Joey Hess
2016-07-11 22:45 ` [PATCH v5 7/8] use smudgeToFile filter in git am Joey Hess
2016-07-11 22:45 ` [PATCH v5 8/8] use smudgeToFile filter in recursive merge Joey Hess
2016-07-12 19:52 ` [PATCH v5 0/8] extend smudge/clean filters with direct file access (for pu) 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1468277112-9909-6-git-send-email-joeyh@joeyh.name \
--to=joeyh@joeyh.name \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).