summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2010-08-28 14:50:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-30 07:37:37 (GMT)
commit23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f (patch)
tree3f2414866b1a352f6a7168214d7d6a0e8a11e81a /builtin/checkout.c
parent62ed0096423b098f9736f5397edad8aa7bf50210 (diff)
downloadgit-23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f.zip
git-23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f.tar.gz
git-23b4c7bcc58431beaf9c870a2d6b2ad4fb088a9f.tar.bz2
checkout: Use submodule.*.ignore settings from .git/config and .gitmodules
For "git status" and the diff family the submodule.*.ignore settings from .git/config and .gitmodules can be used to override the default set via diff.ignoreSubmodules on a per-submodule basis. Let's do this consistently and teach checkout to use these settings too. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index e73bfe3..8294429 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -608,6 +608,10 @@ static int git_checkout_config(const char *var, const char *value, void *cb)
handle_ignore_submodules_arg(&opts->diff_options, value);
return 0;
}
+
+ if (!prefixcmp(var, "submodule."))
+ return parse_submodule_config_option(var, value);
+
return git_xmerge_config(var, value, NULL);
}
@@ -689,6 +693,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
memset(&opts, 0, sizeof(opts));
memset(&new, 0, sizeof(new));
+ gitmodules_config();
git_config(git_checkout_config, &opts);
opts.track = BRANCH_TRACK_UNSPECIFIED;