From: Stefan Beller <sbeller@google.com>
To: jrnieder@gmail.com, gitster@pobox.com, Jens.Lehmann@web.de
Cc: git@vger.kernel.org, pclouds@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 3/7] submodule-config: keep labels around
Date: Tue, 10 May 2016 17:59:53 -0700 [thread overview]
Message-ID: <1462928397-1708-4-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1462928397-1708-1-git-send-email-sbeller@google.com>
We need the submodule labels in a later patch.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
submodule-config.c | 16 ++++++++++++++++
submodule-config.h | 2 ++
2 files changed, 18 insertions(+)
diff --git a/submodule-config.c b/submodule-config.c
index b82d1fb..0cdb47e 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -60,6 +60,10 @@ static void free_one_config(struct submodule_entry *entry)
free((void *) entry->config->path);
free((void *) entry->config->name);
free((void *) entry->config->update_strategy.command);
+ if (entry->config->labels) {
+ string_list_clear(entry->config->labels, 0);
+ free(entry->config->labels);
+ }
free(entry->config);
}
@@ -199,6 +203,7 @@ static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache,
submodule->update_strategy.command = NULL;
submodule->fetch_recurse = RECURSE_SUBMODULES_NONE;
submodule->ignore = NULL;
+ submodule->labels = NULL;
hashcpy(submodule->gitmodules_sha1, gitmodules_sha1);
@@ -353,6 +358,17 @@ static int parse_config(const char *var, const char *value, void *data)
else if (parse_submodule_update_strategy(value,
&submodule->update_strategy) < 0)
die(_("invalid value for %s"), var);
+ } else if (!strcmp(item.buf, "label")) {
+ if (!value)
+ ret = config_error_nonbool(var);
+ else {
+ if (!submodule->labels) {
+ submodule->labels =
+ xmalloc(sizeof(*submodule->labels));
+ string_list_init(submodule->labels, 1);
+ }
+ string_list_insert(submodule->labels, value);
+ }
}
strbuf_release(&name);
diff --git a/submodule-config.h b/submodule-config.h
index e4857f5..d57da59 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -18,6 +18,8 @@ struct submodule {
struct submodule_update_strategy update_strategy;
/* the sha1 blob id of the responsible .gitmodules file */
unsigned char gitmodules_sha1[20];
+ /* sorted, not as on disk */
+ struct string_list *labels;
};
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
--
2.8.0.35.g58985d9.dirty
next prev parent reply other threads:[~2016-05-11 1:00 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-11 0:59 [PATCH 0/7] submodule groups Stefan Beller
2016-05-11 0:59 ` [PATCH 1/7] submodule--helper: add valid-label-name Stefan Beller
2016-05-11 1:11 ` Junio C Hamano
2016-05-11 0:59 ` [PATCH 2/7] submodule add: label submodules if asked to Stefan Beller
2016-05-11 1:13 ` Junio C Hamano
2016-05-11 17:26 ` Stefan Beller
2016-05-11 0:59 ` Stefan Beller [this message]
2016-05-11 1:15 ` [PATCH 3/7] submodule-config: keep labels around Junio C Hamano
2016-05-11 17:41 ` Stefan Beller
2016-05-11 21:28 ` Junio C Hamano
2016-05-11 21:39 ` Stefan Beller
2016-05-11 0:59 ` [PATCH 4/7] submodule-config: check if a submodule is in a group Stefan Beller
2016-05-11 1:19 ` Junio C Hamano
2016-05-11 0:59 ` [PATCH 5/7] submodule--helper module_list_compute: allow label or name arguments Stefan Beller
2016-05-11 1:29 ` Junio C Hamano
2016-05-11 2:24 ` Junio C Hamano
2016-05-11 0:59 ` [PATCH 6/7] submodule update: learn partial initialization Stefan Beller
2016-05-11 0:59 ` [PATCH 7/7] clone: allow specification of submodules to be cloned Stefan Beller
2016-05-11 2:08 ` [PATCH 0/7] submodule groups Junio C Hamano
2016-05-11 23:07 ` Stefan Beller
2016-05-11 23:39 ` Junio C Hamano
2016-05-11 23:48 ` Junio C Hamano
2016-05-11 23:57 ` Stefan Beller
2016-05-12 0:00 ` Junio C Hamano
2016-05-12 4:33 ` Junio C Hamano
2016-05-12 5:50 ` Junio C Hamano
2016-05-12 15:32 ` Stefan Beller
2016-05-12 15:58 ` Junio C Hamano
2016-05-12 16:35 ` Stefan Beller
2016-05-12 16:53 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462928397-1708-4-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.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.
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 NNTP newsgroup(s).