global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-19 13:10:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Submodules: Add the new "fetch" config option for fetch and pull

Browse Source 
The new boolean "fetch" config option controls the default behavior for
"git fetch" and "git pull". It specifies if these commands should recurse
into submodules and fetch new commits there too and can be set separately
for each submodule.

The .gitmodules file is parsed for "submodule.<name>.fetch" entries before
looking for them in .git/config. Thus settings found in .git/config will
override those from .gitmodules, thereby allowing the local developer to
ignore settings given by the remote side while also letting upstream set
defaults for those users who don't have special needs.

This configuration can be overridden by the command line option
"--[no-]recursive" of "git fetch" and "git pull".

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jens Lehmann
2010-08-30 19:37:47 +02:00
committed by Junio C Hamano
parent 496b35e7e0
commit 4e0fb797bf
7 changed files with 85 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
submodule.c
View File

@@ -10,6 +10,7 @@
#include "string-list.h"
struct string_list config_name_for_path;
struct string_list config_fetch_for_name;
struct string_list config_ignore_for_name;
static int add_submodule_odb(const char *path)
@@ -100,6 +101,14 @@ int parse_submodule_config_option(const char *var, const char *value)
config = string_list_append(&config_name_for_path, xstrdup(value));
config->util = strbuf_detach(&submodname, NULL);
strbuf_release(&submodname);
} else if ((len > 5) && !strcmp(var + len - 6, ".fetch")) {
strbuf_add(&submodname, var, len - 6);
config = unsorted_string_list_lookup(&config_fetch_for_name, submodname.buf);
if (!config)
config = string_list_append(&config_fetch_for_name,
strbuf_detach(&submodname, NULL));
config->util = git_config_bool(var, value) ? (void *)1 : NULL;
strbuf_release(&submodname);
} else if ((len > 7) && !strcmp(var + len - 7, ".ignore")) {
if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
strcmp(value, "all") && strcmp(value, "none")) {
@@ -229,7 +238,7 @@ void show_submodule_summary(FILE *f, const char *path,
strbuf_release(&sb);
}
int fetch_populated_submodules()
int fetch_populated_submodules(int forced)
{
int result = 0;
struct child_process cp;
@@ -253,6 +262,14 @@ int fetch_populated_submodules()
struct strbuf submodule_path = STRBUF_INIT;
struct strbuf submodule_git_dir = STRBUF_INIT;
const char *git_dir;
if (!forced) {
struct string_list_item *fetch_option;
fetch_option = unsorted_string_list_lookup(&config_fetch_for_name, name_for_path->util);
if (fetch_option && !fetch_option->util)
continue;
}
strbuf_addf(&submodule_path, "%s/%s", work_tree, name_for_path->string);
strbuf_addf(&submodule_git_dir, "%s/.git", submodule_path.buf);
git_dir = read_gitfile_gently(submodule_git_dir.buf);