diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-28 01:09:51 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-28 01:09:51 +0300 |
commit | 0e41cfad622dde07815d3d575fd3bf05db83da32 (patch) | |
tree | 16affb2e58940325541f73855d01387e42fd4bde /builtin | |
parent | f3cfeb3078ce4af0ac764515795f7e0849a88931 (diff) | |
parent | 64f1f58fe7c0837bd0ae56ba83add5e1b84c54d3 (diff) |
Merge branch 'dl/checkout-guess'
"git checkout" learned to use checkout.guess configuration variable
and enable/disable its "--[no-]guess" option accordingly.
* dl/checkout-guess:
checkout: learn to respect checkout.guess
Documentation/config/checkout: replace sq with backticks
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/checkout.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 2e69ed24f2..7c311cecb3 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1106,11 +1106,16 @@ static int switch_branches(const struct checkout_opts *opts, static int git_checkout_config(const char *var, const char *value, void *cb) { + struct checkout_opts *opts = cb; + if (!strcmp(var, "diff.ignoresubmodules")) { - struct checkout_opts *opts = cb; handle_ignore_submodules_arg(&opts->diff_options, value); return 0; } + if (!strcmp(var, "checkout.guess")) { + opts->dwim_new_local_branch = git_config_bool(var, value); + return 0; + } if (starts_with(var, "submodule.")) return git_default_submodule_config(var, value, NULL); |