From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCHv5 2/9] submodule-config: keep update strategy around
Date: Tue, 24 Nov 2015 17:14:49 -0800 [thread overview]
Message-ID: <1448414096-22021-3-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1448414096-22021-1-git-send-email-sbeller@google.com>
We need the submodule update strategies in a later patch.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
submodule-config.c | 11 +++++++++++
submodule-config.h | 1 +
2 files changed, 12 insertions(+)
diff --git a/submodule-config.c b/submodule-config.c
index afe0ea8..4239b0e 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -194,6 +194,7 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache,
submodule->path = NULL;
submodule->url = NULL;
+ submodule->update = NULL;
submodule->fetch_recurse = RECURSE_SUBMODULES_NONE;
submodule->ignore = NULL;
@@ -311,6 +312,16 @@ static int parse_config(const char *var, const char *value, void *data)
free((void *) submodule->url);
submodule->url = xstrdup(value);
}
+ } else if (!strcmp(item.buf, "update")) {
+ if (!value)
+ ret = config_error_nonbool(var);
+ else if (!me->overwrite && submodule->update != NULL)
+ warn_multiple_config(me->commit_sha1, submodule->name,
+ "update");
+ else {
+ free((void *) submodule->update);
+ submodule->update = xstrdup(value);
+ }
}
strbuf_release(&name);
diff --git a/submodule-config.h b/submodule-config.h
index 9061e4e..f9e2a29 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -14,6 +14,7 @@ struct submodule {
const char *url;
int fetch_recurse;
const char *ignore;
+ const char *update;
/* the sha1 blob id of the responsible .gitmodules file */
unsigned char gitmodules_sha1[20];
};
--
2.6.1.261.g0d9c4c1
next prev parent reply other threads:[~2015-11-25 1:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-25 1:14 [PATCHv5 0/9] Expose submodule parallelism to the user Stefan Beller
2015-11-25 1:14 ` [PATCHv5 1/9] run_processes_parallel: delimit intermixed task output Stefan Beller
2015-11-25 1:14 ` Stefan Beller [this message]
2015-11-25 1:14 ` [PATCHv5 3/9] submodule-config: drop check against NULL Stefan Beller
2015-11-25 1:14 ` [PATCHv5 4/9] submodule-config: remove name_and_item_from_var Stefan Beller
2015-11-25 1:14 ` [PATCHv5 5/9] submodule-config: introduce parse_generic_submodule_config Stefan Beller
2015-11-25 1:14 ` [PATCHv5 6/9] fetching submodules: respect `submodule.fetchJobs` config option Stefan Beller
2015-11-25 1:14 ` [PATCHv5 7/9] git submodule update: have a dedicated helper for cloning Stefan Beller
2015-11-25 1:14 ` [PATCHv5 8/9] submodule update: expose parallelism to the user Stefan Beller
2015-11-25 1:14 ` [PATCHv5 9/9] clone: allow an explicit argument for parallel submodule clones Stefan Beller
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=1448414096-22021-3-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--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).