diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-10 12:33:20 -0700 |
| commit | 11b53957ac81dc31668a1d8fe65d19d5f60dd501 (patch) | |
| tree | e479fc638095c27aabc0245df55b7771b215bbd3 /submodule-config.c | |
| parent | Merge branch 'js/am-3-merge-recursive-direct' (diff) | |
| parent | t7406: fix breakage on OSX (diff) | |
| download | tgif-11b53957ac81dc31668a1d8fe65d19d5f60dd501.tar.xz | |
Merge branch 'sb/submodule-update-dot-branch'
A few updates to "git submodule update".
Use of "| wc -l" break with BSD variant of 'wc'.
* sb/submodule-update-dot-branch:
t7406: fix breakage on OSX
submodule update: allow '.' for branch value
submodule--helper: add remote-branch helper
submodule-config: keep configured branch around
submodule--helper: fix usage string for relative-path
submodule update: narrow scope of local variable
submodule update: respect depth in subsequent fetches
t7406: future proof tests with hard coded depth
Diffstat (limited to 'submodule-config.c')
| -rw-r--r-- | submodule-config.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/submodule-config.c b/submodule-config.c index d22a851d27..098085be69 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -59,6 +59,7 @@ static void free_one_config(struct submodule_entry *entry) { free((void *) entry->config->path); free((void *) entry->config->name); + free((void *) entry->config->branch); free((void *) entry->config->update_strategy.command); free(entry->config); } @@ -199,6 +200,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->branch = NULL; submodule->recommend_shallow = -1; hashcpy(submodule->gitmodules_sha1, gitmodules_sha1); @@ -358,9 +360,16 @@ static int parse_config(const char *var, const char *value, void *data) if (!me->overwrite && submodule->recommend_shallow != -1) warn_multiple_config(me->commit_sha1, submodule->name, "shallow"); - else { + else submodule->recommend_shallow = git_config_bool(var, value); + } else if (!strcmp(item.buf, "branch")) { + if (!me->overwrite && submodule->branch) + warn_multiple_config(me->commit_sha1, submodule->name, + "branch"); + else { + free((void *)submodule->branch); + submodule->branch = xstrdup(value); } } |