From: Damien <damien@dam.io>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] run-command: add hint when a hook is ignored
Date: Fri, 6 Oct 2017 10:04:48 +0200 [thread overview]
Message-ID: <CAAQ5yihg2+BNVG-Dpvq8-qV21uX8xLsDmQpvhUzD5nSvMRFyyQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqh8vcx1nh.fsf@gitster.mtv.corp.google.com>
Thanks for the help, a new patch is coming with those fixes applied.
On Fri, Oct 6, 2017 at 7:53 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> I think it is easier to reason about if this were not "else if", but
>> just a simple "if".
>
> And here are two small suggested changes to the code portion of your
> patch.
>
> - break if / else if cascade into two independent if / if
> statements for clarity.
>
> - give the "ignored hook" advice only once per <process,hook>
> pair.
>
>
>
> run-command.c | 19 +++++++++++++------
> 1 file changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/run-command.c b/run-command.c
> index 0f8a5f7fa2..0e60dd2075 100644
> --- a/run-command.c
> +++ b/run-command.c
> @@ -5,6 +5,7 @@
> #include "argv-array.h"
> #include "thread-utils.h"
> #include "strbuf.h"
> +#include "string-list.h"
>
> void child_process_init(struct child_process *child)
> {
> @@ -1170,19 +1171,25 @@ const char *find_hook(const char *name)
> strbuf_git_path(&path, "hooks/%s", name);
> if (access(path.buf, X_OK) < 0) {
> int err = errno;
> +
> #ifdef STRIP_EXTENSION
> strbuf_addstr(&path, STRIP_EXTENSION);
> if (access(path.buf, X_OK) >= 0)
> return path.buf;
> - else if (errno == EACCES)
> + if (errno == EACCES)
> err = errno;
> #endif
> if (err == EACCES && advice_ignored_hook) {
> - advise(_(
> - "The '%s' hook was ignored because "
> - "it's not set as executable.\n"
> - "You can disable this warning with "
> - "`git config advice.ignoredHook false`."), path.buf);
> + static struct string_list advise_given = STRING_LIST_INIT_DUP;
> +
> + if (!string_list_lookup(&advise_given, name)) {
> + string_list_insert(&advise_given, name);
> + advise(_("The '%s' hook was ignored because "
> + "it's not set as executable.\n"
> + "You can disable this warning with "
> + "`git config advice.ignoredHook false`."),
> + path.buf);
> + }
> }
> return NULL;
> }
> --
> 2.15.0-rc0-155-g07e9c1a78d
>
next prev parent reply other threads:[~2017-10-06 8:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-03 10:59 [PATCH] run-command.c: add hint when hook is not executable Damien
2017-10-04 4:40 ` Junio C Hamano
2017-10-05 20:48 ` Damien
2017-10-05 20:53 ` [PATCH v2] run-command: add hint when a hook is ignored Damien Marié
2017-10-06 4:52 ` Junio C Hamano
2017-10-06 5:25 ` Junio C Hamano
2017-10-06 5:43 ` Junio C Hamano
2017-10-06 5:53 ` Junio C Hamano
2017-10-06 8:04 ` Damien [this message]
2017-10-06 8:07 ` [PATCH v3] " Damien Marié
2017-10-10 4:21 ` Junio C Hamano
2017-10-11 6:26 ` Junio C Hamano
2018-01-03 8:31 ` Jeff King
2018-01-05 19:36 ` Junio C Hamano
2018-03-03 7:16 ` Jeff King
2018-03-05 21:19 ` 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=CAAQ5yihg2+BNVG-Dpvq8-qV21uX8xLsDmQpvhUzD5nSvMRFyyQ@mail.gmail.com \
--to=damien@dam.io \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).