From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: sbeller@google.com, jrnieder@gmail.com, gitster@pobox.com,
Brandon Williams <bmwill@google.com>
Subject: [PATCH v4 04/10] config: add config_from_gitmodules
Date: Wed, 2 Aug 2017 12:49:17 -0700 [thread overview]
Message-ID: <20170802194923.88239-5-bmwill@google.com> (raw)
In-Reply-To: <20170802194923.88239-1-bmwill@google.com>
Add 'config_from_gitmodules()' function which can be used by 'fetch' and
'update_clone' in order to maintain backwards compatibility with
configuration being stored in .gitmodules' since a future patch will
remove reading these values in the submodule-config.
This function should not be used anywhere other than in 'fetch' and
'update_clone'.
Signed-off-by: Brandon Williams <bmwill@google.com>
---
config.c | 17 +++++++++++++++++
config.h | 10 ++++++++++
2 files changed, 27 insertions(+)
diff --git a/config.c b/config.c
index 231f9a750..06645a325 100644
--- a/config.c
+++ b/config.c
@@ -2053,6 +2053,23 @@ int git_config_get_pathname(const char *key, const char **dest)
return repo_config_get_pathname(the_repository, key, dest);
}
+/*
+ * Note: This function exists solely to maintain backward compatibility with
+ * 'fetch' and 'update_clone' storing configuration in '.gitmodules' and should
+ * NOT be used anywhere else.
+ *
+ * Runs the provided config function on the '.gitmodules' file found in the
+ * working directory.
+ */
+void config_from_gitmodules(config_fn_t fn, void *data)
+{
+ if (the_repository->worktree) {
+ char *file = repo_worktree_path(the_repository, GITMODULES_FILE);
+ git_config_from_file(fn, file, data);
+ free(file);
+ }
+}
+
int git_config_get_expiry(const char *key, const char **output)
{
int ret = git_config_get_string_const(key, output);
diff --git a/config.h b/config.h
index 0352da117..6998e6645 100644
--- a/config.h
+++ b/config.h
@@ -187,6 +187,16 @@ extern int repo_config_get_maybe_bool(struct repository *repo,
extern int repo_config_get_pathname(struct repository *repo,
const char *key, const char **dest);
+/*
+ * Note: This function exists solely to maintain backward compatibility with
+ * 'fetch' and 'update_clone' storing configuration in '.gitmodules' and should
+ * NOT be used anywhere else.
+ *
+ * Runs the provided config function on the '.gitmodules' file found in the
+ * working directory.
+ */
+extern void config_from_gitmodules(config_fn_t fn, void *data);
+
extern int git_config_get_value(const char *key, const char **value);
extern const struct string_list *git_config_get_value_multi(const char *key);
extern void git_config_clear(void);
--
2.14.0.rc1.383.gd1ce394fe2-goog
next prev parent reply other threads:[~2017-08-02 19:49 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-11 22:04 [PATCH 0/3] Convert grep to recurse in-process Brandon Williams
2017-07-11 22:04 ` [PATCH 1/3] repo_read_index: don't discard the index Brandon Williams
2017-07-11 23:51 ` Jonathan Nieder
2017-07-12 17:27 ` Brandon Williams
2017-07-11 23:58 ` Stefan Beller
2017-07-12 17:23 ` Brandon Williams
2017-07-11 22:04 ` [PATCH 2/3] setup: have the_repository use the_index Brandon Williams
2017-07-12 0:00 ` Jonathan Nieder
2017-07-12 0:07 ` Stefan Beller
2017-07-12 17:30 ` Brandon Williams
2017-07-12 0:11 ` Junio C Hamano
2017-07-12 18:01 ` Brandon Williams
2017-07-12 20:38 ` Junio C Hamano
2017-07-12 21:33 ` Jonathan Nieder
2017-07-12 21:40 ` Junio C Hamano
2017-07-18 21:34 ` Junio C Hamano
2017-07-11 22:04 ` [PATCH 3/3] grep: recurse in-process using 'struct repository' Brandon Williams
2017-07-11 22:44 ` Jacob Keller
2017-07-12 18:54 ` Brandon Williams
2017-07-12 0:04 ` Stefan Beller
2017-07-12 18:56 ` Brandon Williams
2017-07-12 0:25 ` Jonathan Nieder
2017-07-12 18:49 ` Brandon Williams
2017-07-12 7:42 ` [PATCH 0/3] Convert grep to recurse in-process Jeff King
2017-07-12 18:06 ` Brandon Williams
2017-07-12 18:17 ` Jeff King
2017-07-12 18:24 ` Jonathan Nieder
2017-07-12 18:33 ` Jeff King
2017-07-12 18:09 ` Jonathan Nieder
2017-07-12 18:17 ` Stefan Beller
2017-07-12 18:27 ` Jeff King
2017-07-14 22:28 ` [PATCH v2 " Brandon Williams
2017-07-14 22:28 ` [PATCH v2 1/3] repo_read_index: don't discard the index Brandon Williams
2017-07-14 22:28 ` [PATCH v2 2/3] repository: have the_repository use the_index Brandon Williams
2017-07-14 22:28 ` [PATCH v2 3/3] grep: recurse in-process using 'struct repository' Brandon Williams
2017-07-18 19:05 ` [PATCH v3 00/10] Convert grep to recurse in-process Brandon Williams
2017-07-18 19:05 ` [PATCH v3 01/10] repo_read_index: don't discard the index Brandon Williams
2017-07-18 19:05 ` [PATCH v3 02/10] repository: have the_repository use the_index Brandon Williams
2017-07-18 19:05 ` [PATCH v3 03/10] cache.h: add GITMODULES_FILE macro Brandon Williams
2017-07-31 23:11 ` [PATCH] convert any hard coded .gitmodules file string to the MACRO Stefan Beller
2017-08-01 13:14 ` Jeff Hostetler
2017-08-01 17:35 ` Stefan Beller
2017-08-01 20:26 ` Junio C Hamano
2017-08-02 17:26 ` Brandon Williams
2017-08-02 17:46 ` Brandon Williams
2017-07-18 19:05 ` [PATCH v3 04/10] config: add config_from_gitmodules Brandon Williams
2017-07-18 19:05 ` [PATCH v3 05/10] submodule: remove submodule.fetchjobs from submodule-config parsing Brandon Williams
2017-07-18 19:05 ` [PATCH v3 06/10] submodule: remove fetch.recursesubmodules " Brandon Williams
2017-07-18 19:05 ` [PATCH v3 07/10] submodule: check for unstaged .gitmodules outside of config parsing Brandon Williams
2017-07-31 23:41 ` Stefan Beller
2017-08-02 17:41 ` Brandon Williams
2017-08-02 18:00 ` Brandon Williams
2017-07-18 19:05 ` [PATCH v3 08/10] submodule: check for unmerged " Brandon Williams
2017-07-18 19:05 ` [PATCH v3 09/10] submodule: merge repo_read_gitmodules and gitmodules_config Brandon Williams
2017-07-18 19:05 ` [PATCH v3 10/10] grep: recurse in-process using 'struct repository' Brandon Williams
2017-07-18 19:36 ` [PATCH v3 00/10] Convert grep to recurse in-process Junio C Hamano
2017-07-18 20:06 ` Brandon Williams
2017-08-02 19:49 ` [PATCH v4 " Brandon Williams
2017-08-02 19:49 ` [PATCH v4 01/10] repo_read_index: don't discard the index Brandon Williams
2017-08-02 19:49 ` [PATCH v4 02/10] repository: have the_repository use the_index Brandon Williams
2017-08-02 19:49 ` [PATCH v4 03/10] cache.h: add GITMODULES_FILE macro Brandon Williams
2017-08-02 19:49 ` Brandon Williams [this message]
2017-08-02 19:49 ` [PATCH v4 05/10] submodule: remove submodule.fetchjobs from submodule-config parsing Brandon Williams
2017-08-02 19:49 ` [PATCH v4 06/10] submodule: remove fetch.recursesubmodules " Brandon Williams
2017-08-02 19:49 ` [PATCH v4 07/10] submodule: check for unstaged .gitmodules outside of config parsing Brandon Williams
2017-08-02 19:49 ` [PATCH v4 08/10] submodule: check for unmerged " Brandon Williams
2017-08-02 19:49 ` [PATCH v4 09/10] submodule: merge repo_read_gitmodules and gitmodules_config Brandon Williams
2017-08-02 19:49 ` [PATCH v4 10/10] grep: recurse in-process using 'struct repository' Brandon Williams
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=20170802194923.88239-5-bmwill@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.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).