From: Duy Nguyen <pclouds@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Robin H. Johnson" <robbat2@gentoo.org>,
"Michał Górny" <mgorny@gentoo.org>,
"Git Mailing List" <git@vger.kernel.org>,
"Jeff King" <peff@peff.net>,
"Lars Schneider" <larsxschneider@gmail.com>
Subject: Re: [RFC PATCH] checkout: Force matching mtime between files
Date: Thu, 26 Apr 2018 19:15:40 +0200 [thread overview]
Message-ID: <20180426171540.GA2037@duynguyen.home> (raw)
In-Reply-To: <871sf3el01.fsf@evledraar.gmail.com>
On Wed, Apr 25, 2018 at 10:41:18AM +0200, Ævar Arnfjörð Bjarmason wrote:
> 2. Add some config so we can have hook search paths, and ship with a
> default search path for hooks shipped with git.
I would go for something like this instead of search paths. This
allows you to specify a path to any specific hook in hooks.* config
group. This is basically "$GIT_DIR/hooks directory in config file" but
with lower priority than those in $GIT_DIR/hooks.
Now we can do something like
git -c hooks.post-checkout=/path/to/some/script clone ...
but of course I would need to fix the FIXME or this hook config is
only effective just this one time. (And of course you could put it in
~/.gitconfig)
-- 8< --
diff --git a/builtin/clone.c b/builtin/clone.c
index 7df5932b85..143413ed2d 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -1063,6 +1063,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
strbuf_addf(&branch_top, "refs/remotes/%s/", option_origin);
}
+ /*
+ * FIXME: we should keep all custom config settings via
+ * "git -c ..." in $GIT_DIR/config.
+ */
+
strbuf_addf(&value, "+%s*:%s*", src_ref_prefix, branch_top.buf);
strbuf_addf(&key, "remote.%s.url", option_origin);
git_config_set(key.buf, repo);
diff --git a/run-command.c b/run-command.c
index 84899e423f..ee5b6ea329 100644
--- a/run-command.c
+++ b/run-command.c
@@ -7,6 +7,7 @@
#include "strbuf.h"
#include "string-list.h"
#include "quote.h"
+#include "config.h"
void child_process_init(struct child_process *child)
{
@@ -1256,6 +1257,8 @@ const char *find_hook(const char *name)
strbuf_reset(&path);
strbuf_git_path(&path, "hooks/%s", name);
if (access(path.buf, X_OK) < 0) {
+ const char *cfg_hook;
+ struct strbuf cfg_key = STRBUF_INIT;
int err = errno;
#ifdef STRIP_EXTENSION
@@ -1278,9 +1281,14 @@ const char *find_hook(const char *name)
path.buf);
}
}
- return NULL;
+
+ strbuf_reset(&path);
+ strbuf_addf(&cfg_key, "hooks.%s", name);
+ if (!git_config_get_pathname(cfg_key.buf, &cfg_hook))
+ strbuf_addstr(&path, cfg_hook);
+ strbuf_release(&cfg_key);
}
- return path.buf;
+ return path.len ? path.buf : NULL;
}
int run_hook_ve(const char *const *env, const char *name, va_list args)
-- 8< --
--
Duy
next prev parent reply other threads:[~2018-04-26 17:15 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-13 17:01 [RFC PATCH] checkout: Force matching mtime between files Michał Górny
2018-04-23 20:07 ` Robin H. Johnson
2018-04-23 23:41 ` Junio C Hamano
2018-04-25 7:13 ` Robin H. Johnson
2018-04-25 8:48 ` Junio C Hamano
2018-04-25 15:18 ` Marc Branchaud
2018-04-25 20:07 ` Robin H. Johnson
2018-04-26 1:25 ` Junio C Hamano
2018-04-26 14:12 ` Marc Branchaud
2018-04-26 14:46 ` Michał Górny
2018-04-28 14:23 ` Duy Nguyen
2018-04-28 19:35 ` Michał Górny
2018-04-26 16:43 ` Duy Nguyen
2018-04-26 17:48 ` Robin H. Johnson
2018-04-26 18:44 ` Duy Nguyen
2018-04-29 23:56 ` Junio C Hamano
2018-04-30 15:10 ` Duy Nguyen
2018-04-27 17:03 ` Duy Nguyen
2018-04-27 21:08 ` Elijah Newren
2018-04-28 6:08 ` Duy Nguyen
2018-04-29 23:47 ` Junio C Hamano
2018-04-27 21:08 ` Marc Branchaud
2018-04-28 6:16 ` Duy Nguyen
2018-04-27 17:18 ` Michał Górny
2018-04-27 19:53 ` Ævar Arnfjörð Bjarmason
2018-04-25 8:41 ` Ævar Arnfjörð Bjarmason
2018-04-26 17:15 ` Duy Nguyen [this message]
2018-04-26 17:51 ` Robin H. Johnson
2018-04-26 17:53 ` SZEDER Gábor
2018-04-26 18:45 ` Duy Nguyen
2018-04-24 14:41 ` Marc Branchaud
2018-04-25 6:58 ` Robin H. Johnson
2018-04-25 7:13 ` Michał Górny
2018-05-05 18:44 ` Jeff King
2018-05-06 3:37 ` 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=20180426171540.GA2037@duynguyen.home \
--to=pclouds@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=mgorny@gentoo.org \
--cc=peff@peff.net \
--cc=robbat2@gentoo.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).