From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: jacob.keller@gmail.com, peff@peff.net, gitster@pobox.com,
jrnieder@gmail.com, johannes.schindelin@gmail.com,
Jens.Lehmann@web.de, vlovich@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCHv3 09/13] submodule config: keep update strategy around
Date: Mon, 21 Sep 2015 15:39:15 -0700 [thread overview]
Message-ID: <1442875159-13027-10-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1442875159-13027-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>
---
submodule-config.c | 16 ++++++++++++++++
submodule-config.h | 1 +
2 files changed, 17 insertions(+)
diff --git a/submodule-config.c b/submodule-config.c
index 393de53..0298a60 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;
@@ -326,6 +327,21 @@ static int parse_config(const char *var, const char *value, void *data)
free((void *) submodule->url);
strbuf_addstr(&url, value);
submodule->url = strbuf_detach(&url, NULL);
+ } else if (!strcmp(item.buf, "update")) {
+ struct strbuf update = STRBUF_INIT;
+ if (!value) {
+ ret = config_error_nonbool(var);
+ goto release_return;
+ }
+ if (!me->overwrite && submodule->update != NULL) {
+ warn_multiple_config(me->commit_sha1, submodule->name,
+ "update");
+ goto release_return;
+ }
+
+ free((void *) submodule->update);
+ strbuf_addstr(&update, value);
+ submodule->update = strbuf_detach(&update, NULL);
}
release_return:
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.5.0.275.ge015d2a
next prev parent reply other threads:[~2015-09-21 22:40 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-21 22:39 [PATCHv3 00/13] fetch submodules in parallel and a preview on parallel "submodule update" Stefan Beller
2015-09-21 22:39 ` [PATCHv3 01/13] Sending "Fetching submodule <foo>" output to stderr Stefan Beller
2015-09-21 23:47 ` Junio C Hamano
2015-09-21 22:39 ` [PATCHv3 02/13] xread: poll on non blocking fds Stefan Beller
2015-09-21 23:55 ` Junio C Hamano
2015-09-22 4:55 ` Torsten Bögershausen
2015-09-22 6:23 ` Jacob Keller
2015-09-22 18:40 ` Torsten Bögershausen
2015-09-22 19:45 ` Junio C Hamano
2015-09-22 19:49 ` Jeff King
2015-09-22 20:00 ` Junio C Hamano
2015-09-23 0:14 ` Stefan Beller
2015-09-23 0:43 ` Junio C Hamano
2015-09-23 1:51 ` Jeff King
2015-09-21 23:56 ` Eric Sunshine
2015-09-22 15:58 ` Junio C Hamano
2015-09-22 17:38 ` Stefan Beller
2015-09-22 18:21 ` Junio C Hamano
2015-09-22 18:41 ` Stefan Beller
2015-09-21 22:39 ` [PATCHv3 03/13] xread_nonblock: add functionality to read from fds nonblockingly Stefan Beller
2015-09-22 0:02 ` Junio C Hamano
2015-09-22 0:10 ` Junio C Hamano
2015-09-22 6:26 ` Jacob Keller
2015-09-22 6:27 ` Jacob Keller
2015-09-22 15:59 ` Junio C Hamano
2015-09-21 22:39 ` [PATCHv3 04/13] strbuf: add strbuf_read_once to read without blocking Stefan Beller
2015-09-22 0:17 ` Junio C Hamano
2015-09-22 6:29 ` Jacob Keller
2015-09-21 22:39 ` [PATCHv3 05/13] run-command: factor out return value computation Stefan Beller
2015-09-22 0:38 ` Junio C Hamano
2015-09-21 22:39 ` [PATCHv3 06/13] run-command: add an asynchronous parallel child processor Stefan Beller
2015-09-22 1:08 ` Junio C Hamano
2015-09-22 18:28 ` Stefan Beller
2015-09-22 19:53 ` Junio C Hamano
2015-09-22 21:31 ` Stefan Beller
2015-09-22 21:41 ` Junio C Hamano
2015-09-22 21:54 ` Stefan Beller
2015-09-22 22:23 ` Junio C Hamano
2015-09-21 22:39 ` [PATCHv3 07/13] fetch_populated_submodules: use new parallel job processing Stefan Beller
2015-09-22 16:28 ` Junio C Hamano
2015-09-21 22:39 ` [PATCHv3 08/13] submodules: allow parallel fetching, add tests and documentation Stefan Beller
2015-09-21 22:39 ` Stefan Beller [this message]
2015-09-22 0:56 ` [PATCHv3 09/13] submodule config: keep update strategy around Eric Sunshine
2015-09-22 15:50 ` Stefan Beller
2015-09-21 22:39 ` [PATCHv3 10/13] git submodule update: cmd_update_recursive Stefan Beller
2015-09-21 22:39 ` [PATCHv3 11/13] git submodule update: cmd_update_clone Stefan Beller
2015-09-21 22:39 ` [PATCHv3 12/13] git submodule update: cmd_update_fetch Stefan Beller
2015-09-21 22:39 ` [PATCHv3 13/13] Rewrite submodule update in C 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=1442875159-13027-10-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=jacob.keller@gmail.com \
--cc=johannes.schindelin@gmail.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--cc=vlovich@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.
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).