From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Jens.Lehmann@web.de, gitster@pobox.com, jrnieder@gmail.com,
Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/3] submodule-config: keep `depth` around
Date: Wed, 25 May 2016 15:00:05 -0700 [thread overview]
Message-ID: <20160525220006.27138-3-sbeller@google.com> (raw)
In-Reply-To: <20160525220006.27138-1-sbeller@google.com>
The depth field will be used in a later patch by `submodule update`.
To differentiate between the actual depth (which may be different),
we name it recommended depth as the field in the .gitmodules file
is only a recommendation by the project.
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 debab29..e65a171 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -199,6 +199,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->recommended_depth = -1;
hashcpy(submodule->gitmodules_sha1, gitmodules_sha1);
@@ -353,6 +354,21 @@ 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, "depth")) {
+ if (!value)
+ ret = config_error_nonbool(var);
+ else if (!me->overwrite &&
+ submodule->recommended_depth != -1)
+ warn_multiple_config(me->commit_sha1, submodule->name,
+ "depth");
+ else {
+ int d = strtol(value, NULL, 0);
+ if (d < 0)
+ warning("Invalid parameter '%s' for config option "
+ "'submodule.%s.depth'", value, var);
+ else
+ submodule->recommended_depth = d;
+ }
}
strbuf_release(&name);
diff --git a/submodule-config.h b/submodule-config.h
index e4857f5..5635b6c 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -15,6 +15,7 @@ struct submodule {
const char *url;
int fetch_recurse;
const char *ignore;
+ int recommended_depth;
struct submodule_update_strategy update_strategy;
/* the sha1 blob id of the responsible .gitmodules file */
unsigned char gitmodules_sha1[20];
--
2.9.0.rc0.3.g892bdd0.dirty
next prev parent reply other threads:[~2016-05-25 22:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 22:00 [PATCH 0/3] Submodules: have a depth field in the .gitmodules file Stefan Beller
2016-05-25 22:00 ` [PATCH 1/3] submodule update: make use of the existing fetch_in_submodule function Stefan Beller
2016-05-25 22:41 ` Junio C Hamano
2016-05-25 22:45 ` Stefan Beller
2016-05-25 22:00 ` Stefan Beller [this message]
2016-05-25 22:00 ` [PATCH 3/3] submodule update: learn `--recommended-depth` option Stefan Beller
2016-05-25 22:38 ` [PATCH 0/3] Submodules: have a depth field in the .gitmodules file Junio C Hamano
2016-05-25 22:44 ` Stefan Beller
2020-08-02 15:14 ` medoo
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=20160525220006.27138-3-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 \
/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).