2015-08-18 08:21:57 +08:00
|
|
|
#include "cache.h"
|
2017-06-23 02:43:44 +08:00
|
|
|
#include "repository.h"
|
2017-06-15 02:07:36 +08:00
|
|
|
#include "config.h"
|
2015-08-18 08:21:57 +08:00
|
|
|
#include "submodule-config.h"
|
|
|
|
#include "submodule.h"
|
|
|
|
#include "strbuf.h"
|
2018-05-16 07:42:15 +08:00
|
|
|
#include "object-store.h"
|
2017-06-24 03:13:00 +08:00
|
|
|
#include "parse-options.h"
|
2015-08-18 08:21:57 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* submodule cache lookup structure
|
|
|
|
* There is one shared set of 'struct submodule' entries which can be
|
2018-02-14 08:09:31 +08:00
|
|
|
* looked up by their sha1 blob id of the .gitmodules file and either
|
2015-08-18 08:21:57 +08:00
|
|
|
* using path or name as key.
|
|
|
|
* for_path stores submodule entries with path as key
|
|
|
|
* for_name stores submodule entries with name as key
|
|
|
|
*/
|
|
|
|
struct submodule_cache {
|
|
|
|
struct hashmap for_path;
|
|
|
|
struct hashmap for_name;
|
2017-06-23 02:43:44 +08:00
|
|
|
unsigned initialized:1;
|
2017-08-04 02:19:58 +08:00
|
|
|
unsigned gitmodules_read:1;
|
2015-08-18 08:21:57 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* thin wrapper struct needed to insert 'struct submodule' entries to
|
|
|
|
* the hashmap
|
|
|
|
*/
|
|
|
|
struct submodule_entry {
|
|
|
|
struct hashmap_entry ent;
|
|
|
|
struct submodule *config;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum lookup_type {
|
|
|
|
lookup_name,
|
|
|
|
lookup_path
|
|
|
|
};
|
|
|
|
|
2017-07-01 03:14:05 +08:00
|
|
|
static int config_path_cmp(const void *unused_cmp_data,
|
2017-07-01 08:28:36 +08:00
|
|
|
const void *entry,
|
|
|
|
const void *entry_or_key,
|
2017-07-01 03:14:05 +08:00
|
|
|
const void *unused_keydata)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
2017-07-01 08:28:36 +08:00
|
|
|
const struct submodule_entry *a = entry;
|
|
|
|
const struct submodule_entry *b = entry_or_key;
|
|
|
|
|
2015-08-18 08:21:57 +08:00
|
|
|
return strcmp(a->config->path, b->config->path) ||
|
2018-05-02 08:25:42 +08:00
|
|
|
oidcmp(&a->config->gitmodules_oid, &b->config->gitmodules_oid);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
2017-07-01 03:14:05 +08:00
|
|
|
static int config_name_cmp(const void *unused_cmp_data,
|
2017-07-01 08:28:36 +08:00
|
|
|
const void *entry,
|
|
|
|
const void *entry_or_key,
|
2017-07-01 03:14:05 +08:00
|
|
|
const void *unused_keydata)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
2017-07-01 08:28:36 +08:00
|
|
|
const struct submodule_entry *a = entry;
|
|
|
|
const struct submodule_entry *b = entry_or_key;
|
|
|
|
|
2015-08-18 08:21:57 +08:00
|
|
|
return strcmp(a->config->name, b->config->name) ||
|
2018-05-02 08:25:42 +08:00
|
|
|
oidcmp(&a->config->gitmodules_oid, &b->config->gitmodules_oid);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
2017-06-23 02:43:44 +08:00
|
|
|
static struct submodule_cache *submodule_cache_alloc(void)
|
|
|
|
{
|
|
|
|
return xcalloc(1, sizeof(struct submodule_cache));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void submodule_cache_init(struct submodule_cache *cache)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
2017-07-01 08:28:36 +08:00
|
|
|
hashmap_init(&cache->for_path, config_path_cmp, NULL, 0);
|
|
|
|
hashmap_init(&cache->for_name, config_name_cmp, NULL, 0);
|
2017-06-23 02:43:44 +08:00
|
|
|
cache->initialized = 1;
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void free_one_config(struct submodule_entry *entry)
|
|
|
|
{
|
|
|
|
free((void *) entry->config->path);
|
|
|
|
free((void *) entry->config->name);
|
2016-07-29 08:44:07 +08:00
|
|
|
free((void *) entry->config->branch);
|
2016-03-01 10:07:11 +08:00
|
|
|
free((void *) entry->config->update_strategy.command);
|
2015-08-18 08:21:57 +08:00
|
|
|
free(entry->config);
|
|
|
|
}
|
|
|
|
|
2017-06-23 02:43:44 +08:00
|
|
|
static void submodule_cache_clear(struct submodule_cache *cache)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
|
|
|
struct hashmap_iter iter;
|
|
|
|
struct submodule_entry *entry;
|
|
|
|
|
2017-06-23 02:43:44 +08:00
|
|
|
if (!cache->initialized)
|
|
|
|
return;
|
|
|
|
|
2015-08-18 08:21:57 +08:00
|
|
|
/*
|
|
|
|
* We iterate over the name hash here to be symmetric with the
|
|
|
|
* allocation of struct submodule entries. Each is allocated by
|
2018-02-14 08:09:31 +08:00
|
|
|
* their .gitmodules blob sha1 and submodule name.
|
2015-08-18 08:21:57 +08:00
|
|
|
*/
|
|
|
|
hashmap_iter_init(&cache->for_name, &iter);
|
|
|
|
while ((entry = hashmap_iter_next(&iter)))
|
|
|
|
free_one_config(entry);
|
|
|
|
|
|
|
|
hashmap_free(&cache->for_path, 1);
|
|
|
|
hashmap_free(&cache->for_name, 1);
|
2017-06-23 02:43:44 +08:00
|
|
|
cache->initialized = 0;
|
2017-08-04 02:19:58 +08:00
|
|
|
cache->gitmodules_read = 0;
|
2017-06-23 02:43:44 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void submodule_cache_free(struct submodule_cache *cache)
|
|
|
|
{
|
|
|
|
submodule_cache_clear(cache);
|
|
|
|
free(cache);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
2018-05-02 08:25:42 +08:00
|
|
|
static unsigned int hash_oid_string(const struct object_id *oid,
|
|
|
|
const char *string)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
2018-05-02 08:25:42 +08:00
|
|
|
return memhash(oid->hash, the_hash_algo->rawsz) + strhash(string);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void cache_put_path(struct submodule_cache *cache,
|
|
|
|
struct submodule *submodule)
|
|
|
|
{
|
2018-05-02 08:25:42 +08:00
|
|
|
unsigned int hash = hash_oid_string(&submodule->gitmodules_oid,
|
|
|
|
submodule->path);
|
2015-08-18 08:21:57 +08:00
|
|
|
struct submodule_entry *e = xmalloc(sizeof(*e));
|
|
|
|
hashmap_entry_init(e, hash);
|
|
|
|
e->config = submodule;
|
|
|
|
hashmap_put(&cache->for_path, e);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cache_remove_path(struct submodule_cache *cache,
|
|
|
|
struct submodule *submodule)
|
|
|
|
{
|
2018-05-02 08:25:42 +08:00
|
|
|
unsigned int hash = hash_oid_string(&submodule->gitmodules_oid,
|
|
|
|
submodule->path);
|
2015-08-18 08:21:57 +08:00
|
|
|
struct submodule_entry e;
|
|
|
|
struct submodule_entry *removed;
|
|
|
|
hashmap_entry_init(&e, hash);
|
|
|
|
e.config = submodule;
|
|
|
|
removed = hashmap_remove(&cache->for_path, &e, NULL);
|
|
|
|
free(removed);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cache_add(struct submodule_cache *cache,
|
|
|
|
struct submodule *submodule)
|
|
|
|
{
|
2018-05-02 08:25:42 +08:00
|
|
|
unsigned int hash = hash_oid_string(&submodule->gitmodules_oid,
|
|
|
|
submodule->name);
|
2015-08-18 08:21:57 +08:00
|
|
|
struct submodule_entry *e = xmalloc(sizeof(*e));
|
|
|
|
hashmap_entry_init(e, hash);
|
|
|
|
e->config = submodule;
|
|
|
|
hashmap_add(&cache->for_name, e);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct submodule *cache_lookup_path(struct submodule_cache *cache,
|
2018-05-02 08:25:42 +08:00
|
|
|
const struct object_id *gitmodules_oid, const char *path)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
|
|
|
struct submodule_entry *entry;
|
2018-05-02 08:25:42 +08:00
|
|
|
unsigned int hash = hash_oid_string(gitmodules_oid, path);
|
2015-08-18 08:21:57 +08:00
|
|
|
struct submodule_entry key;
|
|
|
|
struct submodule key_config;
|
|
|
|
|
2018-05-02 08:25:42 +08:00
|
|
|
oidcpy(&key_config.gitmodules_oid, gitmodules_oid);
|
2015-08-18 08:21:57 +08:00
|
|
|
key_config.path = path;
|
|
|
|
|
|
|
|
hashmap_entry_init(&key, hash);
|
|
|
|
key.config = &key_config;
|
|
|
|
|
|
|
|
entry = hashmap_get(&cache->for_path, &key, NULL);
|
|
|
|
if (entry)
|
|
|
|
return entry->config;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct submodule *cache_lookup_name(struct submodule_cache *cache,
|
2018-05-02 08:25:42 +08:00
|
|
|
const struct object_id *gitmodules_oid, const char *name)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
|
|
|
struct submodule_entry *entry;
|
2018-05-02 08:25:42 +08:00
|
|
|
unsigned int hash = hash_oid_string(gitmodules_oid, name);
|
2015-08-18 08:21:57 +08:00
|
|
|
struct submodule_entry key;
|
|
|
|
struct submodule key_config;
|
|
|
|
|
2018-05-02 08:25:42 +08:00
|
|
|
oidcpy(&key_config.gitmodules_oid, gitmodules_oid);
|
2015-08-18 08:21:57 +08:00
|
|
|
key_config.name = name;
|
|
|
|
|
|
|
|
hashmap_entry_init(&key, hash);
|
|
|
|
key.config = &key_config;
|
|
|
|
|
|
|
|
entry = hashmap_get(&cache->for_name, &key, NULL);
|
|
|
|
if (entry)
|
|
|
|
return entry->config;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
submodule-config: verify submodule names as paths
Submodule "names" come from the untrusted .gitmodules file,
but we blindly append them to $GIT_DIR/modules to create our
on-disk repo paths. This means you can do bad things by
putting "../" into the name (among other things).
Let's sanity-check these names to avoid building a path that
can be exploited. There are two main decisions:
1. What should the allowed syntax be?
It's tempting to reuse verify_path(), since submodule
names typically come from in-repo paths. But there are
two reasons not to:
a. It's technically more strict than what we need, as
we really care only about breaking out of the
$GIT_DIR/modules/ hierarchy. E.g., having a
submodule named "foo/.git" isn't actually
dangerous, and it's possible that somebody has
manually given such a funny name.
b. Since we'll eventually use this checking logic in
fsck to prevent downstream repositories, it should
be consistent across platforms. Because
verify_path() relies on is_dir_sep(), it wouldn't
block "foo\..\bar" on a non-Windows machine.
2. Where should we enforce it? These days most of the
.gitmodules reads go through submodule-config.c, so
I've put it there in the reading step. That should
cover all of the C code.
We also construct the name for "git submodule add"
inside the git-submodule.sh script. This is probably
not a big deal for security since the name is coming
from the user anyway, but it would be polite to remind
them if the name they pick is invalid (and we need to
expose the name-checker to the shell anyway for our
test scripts).
This patch issues a warning when reading .gitmodules
and just ignores the related config entry completely.
This will generally end up producing a sensible error,
as it works the same as a .gitmodules file which is
missing a submodule entry (so "submodule update" will
barf, but "git clone --recurse-submodules" will print
an error but not abort the clone.
There is one minor oddity, which is that we print the
warning once per malformed config key (since that's how
the config subsystem gives us the entries). So in the
new test, for example, the user would see three
warnings. That's OK, since the intent is that this case
should never come up outside of malicious repositories
(and then it might even benefit the user to see the
message multiple times).
Credit for finding this vulnerability and the proof of
concept from which the test script was adapted goes to
Etienne Stalmans.
Signed-off-by: Jeff King <peff@peff.net>
2018-04-30 15:25:25 +08:00
|
|
|
int check_submodule_name(const char *name)
|
|
|
|
{
|
|
|
|
/* Disallow empty names */
|
|
|
|
if (!*name)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Look for '..' as a path component. Check both '/' and '\\' as
|
|
|
|
* separators rather than is_dir_sep(), because we want the name rules
|
|
|
|
* to be consistent across platforms.
|
|
|
|
*/
|
|
|
|
goto in_component; /* always start inside component */
|
|
|
|
while (*name) {
|
|
|
|
char c = *name++;
|
|
|
|
if (c == '/' || c == '\\') {
|
|
|
|
in_component:
|
|
|
|
if (name[0] == '.' && name[1] == '.' &&
|
|
|
|
(!name[2] || name[2] == '/' || name[2] == '\\'))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-08-18 08:21:57 +08:00
|
|
|
static int name_and_item_from_var(const char *var, struct strbuf *name,
|
|
|
|
struct strbuf *item)
|
|
|
|
{
|
|
|
|
const char *subsection, *key;
|
|
|
|
int subsection_len, parse;
|
|
|
|
parse = parse_config_key(var, "submodule", &subsection,
|
|
|
|
&subsection_len, &key);
|
|
|
|
if (parse < 0 || !subsection)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
strbuf_add(name, subsection, subsection_len);
|
submodule-config: verify submodule names as paths
Submodule "names" come from the untrusted .gitmodules file,
but we blindly append them to $GIT_DIR/modules to create our
on-disk repo paths. This means you can do bad things by
putting "../" into the name (among other things).
Let's sanity-check these names to avoid building a path that
can be exploited. There are two main decisions:
1. What should the allowed syntax be?
It's tempting to reuse verify_path(), since submodule
names typically come from in-repo paths. But there are
two reasons not to:
a. It's technically more strict than what we need, as
we really care only about breaking out of the
$GIT_DIR/modules/ hierarchy. E.g., having a
submodule named "foo/.git" isn't actually
dangerous, and it's possible that somebody has
manually given such a funny name.
b. Since we'll eventually use this checking logic in
fsck to prevent downstream repositories, it should
be consistent across platforms. Because
verify_path() relies on is_dir_sep(), it wouldn't
block "foo\..\bar" on a non-Windows machine.
2. Where should we enforce it? These days most of the
.gitmodules reads go through submodule-config.c, so
I've put it there in the reading step. That should
cover all of the C code.
We also construct the name for "git submodule add"
inside the git-submodule.sh script. This is probably
not a big deal for security since the name is coming
from the user anyway, but it would be polite to remind
them if the name they pick is invalid (and we need to
expose the name-checker to the shell anyway for our
test scripts).
This patch issues a warning when reading .gitmodules
and just ignores the related config entry completely.
This will generally end up producing a sensible error,
as it works the same as a .gitmodules file which is
missing a submodule entry (so "submodule update" will
barf, but "git clone --recurse-submodules" will print
an error but not abort the clone.
There is one minor oddity, which is that we print the
warning once per malformed config key (since that's how
the config subsystem gives us the entries). So in the
new test, for example, the user would see three
warnings. That's OK, since the intent is that this case
should never come up outside of malicious repositories
(and then it might even benefit the user to see the
message multiple times).
Credit for finding this vulnerability and the proof of
concept from which the test script was adapted goes to
Etienne Stalmans.
Signed-off-by: Jeff King <peff@peff.net>
2018-04-30 15:25:25 +08:00
|
|
|
if (check_submodule_name(name->buf) < 0) {
|
|
|
|
warning(_("ignoring suspicious submodule name: %s"), name->buf);
|
|
|
|
strbuf_release(name);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-08-18 08:21:57 +08:00
|
|
|
strbuf_addstr(item, key);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct submodule *lookup_or_create_by_name(struct submodule_cache *cache,
|
2018-05-02 08:25:42 +08:00
|
|
|
const struct object_id *gitmodules_oid, const char *name)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
|
|
|
struct submodule *submodule;
|
|
|
|
struct strbuf name_buf = STRBUF_INIT;
|
|
|
|
|
2018-05-02 08:25:42 +08:00
|
|
|
submodule = cache_lookup_name(cache, gitmodules_oid, name);
|
2015-08-18 08:21:57 +08:00
|
|
|
if (submodule)
|
|
|
|
return submodule;
|
|
|
|
|
|
|
|
submodule = xmalloc(sizeof(*submodule));
|
|
|
|
|
|
|
|
strbuf_addstr(&name_buf, name);
|
|
|
|
submodule->name = strbuf_detach(&name_buf, NULL);
|
|
|
|
|
|
|
|
submodule->path = NULL;
|
|
|
|
submodule->url = NULL;
|
2016-03-01 10:07:11 +08:00
|
|
|
submodule->update_strategy.type = SM_UPDATE_UNSPECIFIED;
|
|
|
|
submodule->update_strategy.command = NULL;
|
2015-08-18 08:21:57 +08:00
|
|
|
submodule->fetch_recurse = RECURSE_SUBMODULES_NONE;
|
|
|
|
submodule->ignore = NULL;
|
2016-07-29 08:44:07 +08:00
|
|
|
submodule->branch = NULL;
|
2016-05-27 05:59:42 +08:00
|
|
|
submodule->recommend_shallow = -1;
|
2015-08-18 08:21:57 +08:00
|
|
|
|
2018-05-02 08:25:42 +08:00
|
|
|
oidcpy(&submodule->gitmodules_oid, gitmodules_oid);
|
2015-08-18 08:21:57 +08:00
|
|
|
|
|
|
|
cache_add(cache, submodule);
|
|
|
|
|
|
|
|
return submodule;
|
|
|
|
}
|
|
|
|
|
2015-08-18 08:22:00 +08:00
|
|
|
static int parse_fetch_recurse(const char *opt, const char *arg,
|
|
|
|
int die_on_error)
|
|
|
|
{
|
2017-08-08 02:20:49 +08:00
|
|
|
switch (git_parse_maybe_bool(arg)) {
|
2015-08-18 08:22:00 +08:00
|
|
|
case 1:
|
|
|
|
return RECURSE_SUBMODULES_ON;
|
|
|
|
case 0:
|
|
|
|
return RECURSE_SUBMODULES_OFF;
|
|
|
|
default:
|
|
|
|
if (!strcmp(arg, "on-demand"))
|
|
|
|
return RECURSE_SUBMODULES_ON_DEMAND;
|
|
|
|
|
|
|
|
if (die_on_error)
|
|
|
|
die("bad %s argument: %s", opt, arg);
|
|
|
|
else
|
|
|
|
return RECURSE_SUBMODULES_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-03 03:49:18 +08:00
|
|
|
int parse_submodule_fetchjobs(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
int fetchjobs = git_config_int(var, value);
|
|
|
|
if (fetchjobs < 0)
|
|
|
|
die(_("negative values not allowed for submodule.fetchjobs"));
|
|
|
|
return fetchjobs;
|
|
|
|
}
|
|
|
|
|
2015-08-18 08:22:00 +08:00
|
|
|
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
|
|
|
|
{
|
|
|
|
return parse_fetch_recurse(opt, arg, 1);
|
|
|
|
}
|
|
|
|
|
2017-06-24 03:13:00 +08:00
|
|
|
int option_fetch_parse_recurse_submodules(const struct option *opt,
|
|
|
|
const char *arg, int unset)
|
|
|
|
{
|
|
|
|
int *v;
|
|
|
|
|
|
|
|
if (!opt->value)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
v = opt->value;
|
|
|
|
|
|
|
|
if (unset) {
|
|
|
|
*v = RECURSE_SUBMODULES_OFF;
|
|
|
|
} else {
|
|
|
|
if (arg)
|
|
|
|
*v = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
|
|
|
|
else
|
|
|
|
*v = RECURSE_SUBMODULES_ON;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-03-15 05:46:32 +08:00
|
|
|
static int parse_update_recurse(const char *opt, const char *arg,
|
|
|
|
int die_on_error)
|
|
|
|
{
|
2017-08-23 01:29:03 +08:00
|
|
|
switch (git_parse_maybe_bool(arg)) {
|
2017-03-15 05:46:32 +08:00
|
|
|
case 1:
|
|
|
|
return RECURSE_SUBMODULES_ON;
|
|
|
|
case 0:
|
|
|
|
return RECURSE_SUBMODULES_OFF;
|
|
|
|
default:
|
|
|
|
if (die_on_error)
|
|
|
|
die("bad %s argument: %s", opt, arg);
|
|
|
|
return RECURSE_SUBMODULES_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int parse_update_recurse_submodules_arg(const char *opt, const char *arg)
|
|
|
|
{
|
|
|
|
return parse_update_recurse(opt, arg, 1);
|
|
|
|
}
|
|
|
|
|
2015-11-17 19:05:56 +08:00
|
|
|
static int parse_push_recurse(const char *opt, const char *arg,
|
|
|
|
int die_on_error)
|
|
|
|
{
|
2017-08-08 02:20:49 +08:00
|
|
|
switch (git_parse_maybe_bool(arg)) {
|
2015-11-17 19:05:56 +08:00
|
|
|
case 1:
|
|
|
|
/* There's no simple "on" value when pushing */
|
|
|
|
if (die_on_error)
|
|
|
|
die("bad %s argument: %s", opt, arg);
|
|
|
|
else
|
|
|
|
return RECURSE_SUBMODULES_ERROR;
|
|
|
|
case 0:
|
|
|
|
return RECURSE_SUBMODULES_OFF;
|
|
|
|
default:
|
|
|
|
if (!strcmp(arg, "on-demand"))
|
|
|
|
return RECURSE_SUBMODULES_ON_DEMAND;
|
|
|
|
else if (!strcmp(arg, "check"))
|
|
|
|
return RECURSE_SUBMODULES_CHECK;
|
2016-12-20 02:25:32 +08:00
|
|
|
else if (!strcmp(arg, "only"))
|
|
|
|
return RECURSE_SUBMODULES_ONLY;
|
2015-11-17 19:05:56 +08:00
|
|
|
else if (die_on_error)
|
|
|
|
die("bad %s argument: %s", opt, arg);
|
|
|
|
else
|
|
|
|
return RECURSE_SUBMODULES_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int parse_push_recurse_submodules_arg(const char *opt, const char *arg)
|
|
|
|
{
|
|
|
|
return parse_push_recurse(opt, arg, 1);
|
|
|
|
}
|
|
|
|
|
2018-05-02 08:25:42 +08:00
|
|
|
static void warn_multiple_config(const struct object_id *treeish_name,
|
2015-08-18 08:21:57 +08:00
|
|
|
const char *name, const char *option)
|
|
|
|
{
|
|
|
|
const char *commit_string = "WORKTREE";
|
2016-11-23 04:14:37 +08:00
|
|
|
if (treeish_name)
|
2018-05-02 08:25:42 +08:00
|
|
|
commit_string = oid_to_hex(treeish_name);
|
2015-08-18 08:21:57 +08:00
|
|
|
warning("%s:.gitmodules, multiple configurations found for "
|
|
|
|
"'submodule.%s.%s'. Skipping second one!",
|
|
|
|
commit_string, name, option);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct parse_config_parameter {
|
|
|
|
struct submodule_cache *cache;
|
2018-05-02 08:25:42 +08:00
|
|
|
const struct object_id *treeish_name;
|
|
|
|
const struct object_id *gitmodules_oid;
|
2015-08-18 08:21:57 +08:00
|
|
|
int overwrite;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int parse_config(const char *var, const char *value, void *data)
|
|
|
|
{
|
|
|
|
struct parse_config_parameter *me = data;
|
|
|
|
struct submodule *submodule;
|
|
|
|
struct strbuf name = STRBUF_INIT, item = STRBUF_INIT;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
/* this also ensures that we only parse submodule entries */
|
|
|
|
if (!name_and_item_from_var(var, &name, &item))
|
|
|
|
return 0;
|
|
|
|
|
2015-10-13 01:58:58 +08:00
|
|
|
submodule = lookup_or_create_by_name(me->cache,
|
2018-05-02 08:25:42 +08:00
|
|
|
me->gitmodules_oid,
|
2015-10-13 01:58:58 +08:00
|
|
|
name.buf);
|
2015-08-18 08:21:57 +08:00
|
|
|
|
|
|
|
if (!strcmp(item.buf, "path")) {
|
2015-10-13 01:58:58 +08:00
|
|
|
if (!value)
|
2015-08-18 08:21:57 +08:00
|
|
|
ret = config_error_nonbool(var);
|
2016-03-01 10:07:12 +08:00
|
|
|
else if (!me->overwrite && submodule->path)
|
2016-11-23 04:14:37 +08:00
|
|
|
warn_multiple_config(me->treeish_name, submodule->name,
|
2015-08-18 08:21:57 +08:00
|
|
|
"path");
|
2015-10-13 01:58:58 +08:00
|
|
|
else {
|
|
|
|
if (submodule->path)
|
|
|
|
cache_remove_path(me->cache, submodule);
|
|
|
|
free((void *) submodule->path);
|
|
|
|
submodule->path = xstrdup(value);
|
|
|
|
cache_put_path(me->cache, submodule);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
} else if (!strcmp(item.buf, "fetchrecursesubmodules")) {
|
2015-08-18 08:22:00 +08:00
|
|
|
/* when parsing worktree configurations we can die early */
|
2018-05-02 08:25:42 +08:00
|
|
|
int die_on_error = is_null_oid(me->gitmodules_oid);
|
2015-08-18 08:21:57 +08:00
|
|
|
if (!me->overwrite &&
|
2015-10-13 01:58:58 +08:00
|
|
|
submodule->fetch_recurse != RECURSE_SUBMODULES_NONE)
|
2016-11-23 04:14:37 +08:00
|
|
|
warn_multiple_config(me->treeish_name, submodule->name,
|
2015-08-18 08:21:57 +08:00
|
|
|
"fetchrecursesubmodules");
|
2015-10-13 01:58:58 +08:00
|
|
|
else
|
|
|
|
submodule->fetch_recurse = parse_fetch_recurse(
|
|
|
|
var, value,
|
2015-08-18 08:22:00 +08:00
|
|
|
die_on_error);
|
2015-08-18 08:21:57 +08:00
|
|
|
} else if (!strcmp(item.buf, "ignore")) {
|
2015-10-13 01:58:58 +08:00
|
|
|
if (!value)
|
|
|
|
ret = config_error_nonbool(var);
|
2016-03-01 10:07:12 +08:00
|
|
|
else if (!me->overwrite && submodule->ignore)
|
2016-11-23 04:14:37 +08:00
|
|
|
warn_multiple_config(me->treeish_name, submodule->name,
|
2015-08-18 08:21:57 +08:00
|
|
|
"ignore");
|
2015-10-13 01:58:58 +08:00
|
|
|
else if (strcmp(value, "untracked") &&
|
|
|
|
strcmp(value, "dirty") &&
|
|
|
|
strcmp(value, "all") &&
|
|
|
|
strcmp(value, "none"))
|
2015-08-18 08:21:57 +08:00
|
|
|
warning("Invalid parameter '%s' for config option "
|
2017-03-15 06:14:40 +08:00
|
|
|
"'submodule.%s.ignore'", value, name.buf);
|
2015-10-13 01:58:58 +08:00
|
|
|
else {
|
|
|
|
free((void *) submodule->ignore);
|
|
|
|
submodule->ignore = xstrdup(value);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
} else if (!strcmp(item.buf, "url")) {
|
|
|
|
if (!value) {
|
|
|
|
ret = config_error_nonbool(var);
|
2016-03-01 10:07:12 +08:00
|
|
|
} else if (!me->overwrite && submodule->url) {
|
2016-11-23 04:14:37 +08:00
|
|
|
warn_multiple_config(me->treeish_name, submodule->name,
|
2015-08-18 08:21:57 +08:00
|
|
|
"url");
|
2015-10-13 01:58:58 +08:00
|
|
|
} else {
|
|
|
|
free((void *) submodule->url);
|
|
|
|
submodule->url = xstrdup(value);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
2016-03-01 10:07:11 +08:00
|
|
|
} else if (!strcmp(item.buf, "update")) {
|
|
|
|
if (!value)
|
|
|
|
ret = config_error_nonbool(var);
|
|
|
|
else if (!me->overwrite &&
|
|
|
|
submodule->update_strategy.type != SM_UPDATE_UNSPECIFIED)
|
2016-11-23 04:14:37 +08:00
|
|
|
warn_multiple_config(me->treeish_name, submodule->name,
|
2016-03-01 10:07:11 +08:00
|
|
|
"update");
|
|
|
|
else if (parse_submodule_update_strategy(value,
|
|
|
|
&submodule->update_strategy) < 0)
|
|
|
|
die(_("invalid value for %s"), var);
|
2016-05-27 05:59:42 +08:00
|
|
|
} else if (!strcmp(item.buf, "shallow")) {
|
|
|
|
if (!me->overwrite && submodule->recommend_shallow != -1)
|
2016-11-23 04:14:37 +08:00
|
|
|
warn_multiple_config(me->treeish_name, submodule->name,
|
2016-05-27 05:59:42 +08:00
|
|
|
"shallow");
|
2016-07-29 08:44:07 +08:00
|
|
|
else
|
2016-05-27 05:59:42 +08:00
|
|
|
submodule->recommend_shallow =
|
|
|
|
git_config_bool(var, value);
|
2016-07-29 08:44:07 +08:00
|
|
|
} else if (!strcmp(item.buf, "branch")) {
|
|
|
|
if (!me->overwrite && submodule->branch)
|
2016-11-23 04:14:37 +08:00
|
|
|
warn_multiple_config(me->treeish_name, submodule->name,
|
2016-07-29 08:44:07 +08:00
|
|
|
"branch");
|
|
|
|
else {
|
|
|
|
free((void *)submodule->branch);
|
|
|
|
submodule->branch = xstrdup(value);
|
2016-05-27 05:59:42 +08:00
|
|
|
}
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
strbuf_release(&name);
|
|
|
|
strbuf_release(&item);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2017-08-04 02:19:57 +08:00
|
|
|
static int gitmodule_oid_from_commit(const struct object_id *treeish_name,
|
|
|
|
struct object_id *gitmodules_oid,
|
|
|
|
struct strbuf *rev)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
2017-07-14 07:49:20 +08:00
|
|
|
if (is_null_oid(treeish_name)) {
|
|
|
|
oidclr(gitmodules_oid);
|
2015-08-18 08:21:57 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2017-07-14 07:49:20 +08:00
|
|
|
strbuf_addf(rev, "%s:.gitmodules", oid_to_hex(treeish_name));
|
|
|
|
if (get_oid(rev->buf, gitmodules_oid) >= 0)
|
2015-08-18 08:21:57 +08:00
|
|
|
ret = 1;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This does a lookup of a submodule configuration by name or by path
|
|
|
|
* (key) with on-demand reading of the appropriate .gitmodules from
|
|
|
|
* revisions.
|
|
|
|
*/
|
|
|
|
static const struct submodule *config_from(struct submodule_cache *cache,
|
2017-07-14 07:49:20 +08:00
|
|
|
const struct object_id *treeish_name, const char *key,
|
2015-08-18 08:21:57 +08:00
|
|
|
enum lookup_type lookup_type)
|
|
|
|
{
|
|
|
|
struct strbuf rev = STRBUF_INIT;
|
|
|
|
unsigned long config_size;
|
2016-07-28 20:49:47 +08:00
|
|
|
char *config = NULL;
|
2017-07-14 07:49:20 +08:00
|
|
|
struct object_id oid;
|
2015-08-18 08:21:57 +08:00
|
|
|
enum object_type type;
|
|
|
|
const struct submodule *submodule = NULL;
|
|
|
|
struct parse_config_parameter parameter;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If any parameter except the cache is a NULL pointer just
|
|
|
|
* return the first submodule. Can be used to check whether
|
|
|
|
* there are any submodules parsed.
|
|
|
|
*/
|
2016-11-23 04:14:37 +08:00
|
|
|
if (!treeish_name || !key) {
|
2015-08-18 08:21:57 +08:00
|
|
|
struct hashmap_iter iter;
|
|
|
|
struct submodule_entry *entry;
|
|
|
|
|
2016-03-16 15:46:31 +08:00
|
|
|
entry = hashmap_iter_first(&cache->for_name, &iter);
|
2015-08-18 08:21:57 +08:00
|
|
|
if (!entry)
|
|
|
|
return NULL;
|
|
|
|
return entry->config;
|
|
|
|
}
|
|
|
|
|
2017-07-14 07:49:20 +08:00
|
|
|
if (!gitmodule_oid_from_commit(treeish_name, &oid, &rev))
|
2016-07-28 20:49:47 +08:00
|
|
|
goto out;
|
2015-08-18 08:21:57 +08:00
|
|
|
|
|
|
|
switch (lookup_type) {
|
|
|
|
case lookup_name:
|
2018-05-02 08:25:42 +08:00
|
|
|
submodule = cache_lookup_name(cache, &oid, key);
|
2015-08-18 08:21:57 +08:00
|
|
|
break;
|
|
|
|
case lookup_path:
|
2018-05-02 08:25:42 +08:00
|
|
|
submodule = cache_lookup_path(cache, &oid, key);
|
2015-08-18 08:21:57 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (submodule)
|
2016-07-28 20:49:47 +08:00
|
|
|
goto out;
|
2015-08-18 08:21:57 +08:00
|
|
|
|
sha1_file: convert read_sha1_file to struct object_id
Convert read_sha1_file to take a pointer to struct object_id and rename
it read_object_file. Do the same for read_sha1_file_extended.
Convert one use in grep.c to use the new function without any other code
change, since the pointer being passed is a void pointer that is already
initialized with a pointer to struct object_id. Update the declaration
and definitions of the modified functions, and apply the following
semantic patch to convert the remaining callers:
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1.hash, E2, E3)
+ read_object_file(&E1, E2, E3)
@@
expression E1, E2, E3;
@@
- read_sha1_file(E1->hash, E2, E3)
+ read_object_file(E1, E2, E3)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1.hash, E2, E3, E4)
+ read_object_file_extended(&E1, E2, E3, E4)
@@
expression E1, E2, E3, E4;
@@
- read_sha1_file_extended(E1->hash, E2, E3, E4)
+ read_object_file_extended(E1, E2, E3, E4)
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-12 10:27:53 +08:00
|
|
|
config = read_object_file(&oid, &type, &config_size);
|
2016-07-28 20:49:47 +08:00
|
|
|
if (!config || type != OBJ_BLOB)
|
|
|
|
goto out;
|
2015-08-18 08:21:57 +08:00
|
|
|
|
|
|
|
/* fill the submodule config into the cache */
|
|
|
|
parameter.cache = cache;
|
2018-05-02 08:25:42 +08:00
|
|
|
parameter.treeish_name = treeish_name;
|
|
|
|
parameter.gitmodules_oid = &oid;
|
2015-08-18 08:21:57 +08:00
|
|
|
parameter.overwrite = 0;
|
i18n: config: unfold error messages marked for translation
Introduced in 473166b ("config: add 'origin_type' to config_source
struct", 2016-02-19), Git can inform the user about the origin of a
config error, but the implementation does not allow translators to
translate the keywords 'file', 'blob, 'standard input', and
'submodule-blob'. Moreover, for the second message, a reason for the
error is appended to the message, not allowing translators to translate
that reason either.
Unfold the message into several templates for each known origin_type.
That would result in better translation at the expense of code
verbosity.
Add enum config_oringin_type to ease management of the various
configuration origin types (blob, file, etc). Previously origin type
was considered from command line if cf->origin_type == NULL, i.e.,
uninitialized. Now we set origin_type to CONFIG_ORIGIN_CMDLINE in
git_config_from_parameters() and configset_add_value().
For error message in git_parse_source(), use xstrfmt() function to
prepare the message string, instead of doing something like it's done
for die_bad_number(), because intelligibility and code conciseness are
improved for that instance.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-07-28 21:14:03 +08:00
|
|
|
git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,
|
2016-02-19 17:16:01 +08:00
|
|
|
config, config_size, ¶meter);
|
2016-07-28 20:49:11 +08:00
|
|
|
strbuf_release(&rev);
|
2015-08-18 08:21:57 +08:00
|
|
|
free(config);
|
|
|
|
|
|
|
|
switch (lookup_type) {
|
|
|
|
case lookup_name:
|
2018-05-02 08:25:42 +08:00
|
|
|
return cache_lookup_name(cache, &oid, key);
|
2015-08-18 08:21:57 +08:00
|
|
|
case lookup_path:
|
2018-05-02 08:25:42 +08:00
|
|
|
return cache_lookup_path(cache, &oid, key);
|
2015-08-18 08:21:57 +08:00
|
|
|
default:
|
|
|
|
return NULL;
|
|
|
|
}
|
2016-07-28 20:49:47 +08:00
|
|
|
|
|
|
|
out:
|
|
|
|
strbuf_release(&rev);
|
|
|
|
free(config);
|
|
|
|
return submodule;
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
2017-06-23 02:43:44 +08:00
|
|
|
static void submodule_cache_check_init(struct repository *repo)
|
2015-08-18 08:21:57 +08:00
|
|
|
{
|
2017-06-23 02:43:44 +08:00
|
|
|
if (repo->submodule_cache && repo->submodule_cache->initialized)
|
2015-08-18 08:21:57 +08:00
|
|
|
return;
|
|
|
|
|
2017-06-23 02:43:44 +08:00
|
|
|
if (!repo->submodule_cache)
|
|
|
|
repo->submodule_cache = submodule_cache_alloc();
|
|
|
|
|
|
|
|
submodule_cache_init(repo->submodule_cache);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
2017-08-04 02:19:57 +08:00
|
|
|
static int gitmodules_cb(const char *var, const char *value, void *data)
|
2015-08-18 08:21:59 +08:00
|
|
|
{
|
2017-08-04 02:19:57 +08:00
|
|
|
struct repository *repo = data;
|
2015-08-18 08:21:59 +08:00
|
|
|
struct parse_config_parameter parameter;
|
2017-06-23 02:43:44 +08:00
|
|
|
|
|
|
|
parameter.cache = repo->submodule_cache;
|
2016-11-23 04:14:37 +08:00
|
|
|
parameter.treeish_name = NULL;
|
2018-05-02 08:25:42 +08:00
|
|
|
parameter.gitmodules_oid = &null_oid;
|
2015-08-18 08:21:59 +08:00
|
|
|
parameter.overwrite = 1;
|
|
|
|
|
|
|
|
return parse_config(var, value, ¶meter);
|
|
|
|
}
|
|
|
|
|
2017-08-04 02:19:57 +08:00
|
|
|
void repo_read_gitmodules(struct repository *repo)
|
2017-06-23 02:43:44 +08:00
|
|
|
{
|
2017-08-04 02:19:58 +08:00
|
|
|
submodule_cache_check_init(repo);
|
|
|
|
|
2017-08-04 02:19:57 +08:00
|
|
|
if (repo->worktree) {
|
|
|
|
char *gitmodules;
|
|
|
|
|
|
|
|
if (repo_read_index(repo) < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
gitmodules = repo_worktree_path(repo, GITMODULES_FILE);
|
|
|
|
|
|
|
|
if (!is_gitmodules_unmerged(repo->index))
|
|
|
|
git_config_from_file(gitmodules_cb, gitmodules, repo);
|
|
|
|
|
|
|
|
free(gitmodules);
|
|
|
|
}
|
2017-08-04 02:19:58 +08:00
|
|
|
|
|
|
|
repo->submodule_cache->gitmodules_read = 1;
|
2017-08-04 02:19:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void gitmodules_config_oid(const struct object_id *commit_oid)
|
|
|
|
{
|
|
|
|
struct strbuf rev = STRBUF_INIT;
|
|
|
|
struct object_id oid;
|
|
|
|
|
2017-08-04 02:19:58 +08:00
|
|
|
submodule_cache_check_init(the_repository);
|
|
|
|
|
2017-08-04 02:19:57 +08:00
|
|
|
if (gitmodule_oid_from_commit(commit_oid, &oid, &rev)) {
|
|
|
|
git_config_from_blob_oid(gitmodules_cb, rev.buf,
|
|
|
|
&oid, the_repository);
|
|
|
|
}
|
|
|
|
strbuf_release(&rev);
|
2017-08-04 02:19:58 +08:00
|
|
|
|
|
|
|
the_repository->submodule_cache->gitmodules_read = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void gitmodules_read_check(struct repository *repo)
|
|
|
|
{
|
|
|
|
submodule_cache_check_init(repo);
|
|
|
|
|
|
|
|
/* read the repo's .gitmodules file if it hasn't been already */
|
|
|
|
if (!repo->submodule_cache->gitmodules_read)
|
|
|
|
repo_read_gitmodules(repo);
|
2017-06-23 02:43:44 +08:00
|
|
|
}
|
|
|
|
|
2018-03-29 06:35:29 +08:00
|
|
|
const struct submodule *submodule_from_name(struct repository *r,
|
|
|
|
const struct object_id *treeish_name,
|
2015-08-18 08:21:57 +08:00
|
|
|
const char *name)
|
|
|
|
{
|
2018-03-29 06:35:29 +08:00
|
|
|
gitmodules_read_check(r);
|
|
|
|
return config_from(r->submodule_cache, treeish_name, name, lookup_name);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|
|
|
|
|
2018-03-29 06:35:29 +08:00
|
|
|
const struct submodule *submodule_from_path(struct repository *r,
|
|
|
|
const struct object_id *treeish_name,
|
2015-08-18 08:21:57 +08:00
|
|
|
const char *path)
|
|
|
|
{
|
2018-03-29 06:35:29 +08:00
|
|
|
gitmodules_read_check(r);
|
|
|
|
return config_from(r->submodule_cache, treeish_name, path, lookup_path);
|
2017-06-23 02:43:44 +08:00
|
|
|
}
|
|
|
|
|
2018-03-29 06:35:28 +08:00
|
|
|
void submodule_free(struct repository *r)
|
2017-06-23 02:43:44 +08:00
|
|
|
{
|
2018-03-29 06:35:28 +08:00
|
|
|
if (r->submodule_cache)
|
|
|
|
submodule_cache_clear(r->submodule_cache);
|
2015-08-18 08:21:57 +08:00
|
|
|
}
|