| Message ID | 8172602f6f1bbdfe39c8a1219dd3b9a222eb65fa.1601810233.git.liu.denton@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | checkout: learn the checkout.guess config variable | expand |
Denton Liu <liu.denton@gmail.com> writes: > The current behavior of git checkout/switch is that --guess is currently > enabled by default. However, some users may not wish for this to happen > automatically. Instead of forcing users to specify --no-guess manually > each time, teach these commands the checkout.guess configuration > variable that gives users the option to set a default behavior. > > Teach the completion script to recognize the new config variable and > disable DWIM logic if it is set to false. > > Signed-off-by: Denton Liu <liu.denton@gmail.com> > --- Asking for input from Dscho on how to futureproof the tests along the same line as js/default-branch-name-part-2 topic. > Documentation/config/checkout.txt | 5 +++ > Documentation/git-checkout.txt | 3 ++ > Documentation/git-switch.txt | 3 ++ > builtin/checkout.c | 7 +++- > contrib/completion/git-completion.bash | 15 ++++++-- > t/t2024-checkout-dwim.sh | 11 ++++++ > t/t2060-switch.sh | 5 ++- > t/t9902-completion.sh | 52 ++++++++++++++++++++++++++ > 8 files changed, 95 insertions(+), 6 deletions(-) > > diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt > index e3684a5459..2cddf7b4b4 100644 > --- a/Documentation/config/checkout.txt > +++ b/Documentation/config/checkout.txt > @@ -16,3 +16,8 @@ will checkout the `<something>` branch on another remote, > and by linkgit:git-worktree[1] when `git worktree add` refers to a > remote branch. This setting might be used for other checkout-like > commands or functionality in the future. > + > +checkout.guess:: > + Provides the default value for the `--guess` or `--no-guess` > + option in `git checkout` and `git switch`. See > + linkgit:git-switch[1] and linkgit:git-checkout[1]. > diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt > index afa5c11fd3..28f656d04e 100644 > --- a/Documentation/git-checkout.txt > +++ b/Documentation/git-checkout.txt > @@ -193,6 +193,9 @@ branches from there if `<branch>` is ambiguous but exists on the > linkgit:git-config[1]. > + > Use `--no-guess` to disable this. > ++ > +The default behavior can be set via the `checkout.guess` configuration > +variable. > > -l:: > Create the new branch's reflog; see linkgit:git-branch[1] for > diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt > index 3759c3a265..5c438cd505 100644 > --- a/Documentation/git-switch.txt > +++ b/Documentation/git-switch.txt > @@ -103,6 +103,9 @@ ambiguous but exists on the 'origin' remote. See also > `checkout.defaultRemote` in linkgit:git-config[1]. > + > `--guess` is the default behavior. Use `--no-guess` to disable it. > ++ > +The default behavior can be set via the `checkout.guess` configuration > +variable. > > -f:: > --force:: > diff --git a/builtin/checkout.c b/builtin/checkout.c > index 0951f8fee5..0c0394a0d6 100644 > --- a/builtin/checkout.c > +++ b/builtin/checkout.c > @@ -1093,11 +1093,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; This change does make sense even without a new configuration variable, as 'cb' given by the caller applies to everything this function handles, not just for a particular configuration variable (not a suggestion to split this out as a separate clean-up patch; it is too small for it to be worth). > 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); OK. > diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash > index 8be4a0316e..45ecbb9849 100644 > --- a/contrib/completion/git-completion.bash > +++ b/contrib/completion/git-completion.bash > @@ -1470,11 +1470,12 @@ _git_bundle () > # To decide between the following rules in priority order > # 1) the last provided of "--guess" or "--no-guess" explicitly enable or > # disable completion of DWIM logic respectively. > -# 2) If the --no-track option is provided, take this as a hint to disable the > +# 2) If checkout.guess is false, disable completion of DWIM logic. > +# 3) If the --no-track option is provided, take this as a hint to disable the > # DWIM completion logic > -# 3) If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion > +# 4) If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion > # logic, as requested by the user. > -# 4) Enable DWIM logic otherwise. > +# 5) Enable DWIM logic otherwise. > # We may went to consider dropping numbers from these entries, as nobody refers to another entry with its number (e.g. "contrary to step 2, if this condition holds, do X"), and we already say "in this order" upfront. > __git_checkout_default_dwim_mode () > { > @@ -1485,11 +1486,17 @@ __git_checkout_default_dwim_mode () > fi > > # --no-track disables DWIM, but with lower priority than > - # --guess/--no-guess > + # --guess/--no-guess/checkout.guess > if [ -n "$(__git_find_on_cmdline "--no-track")" ]; then > dwim_opt="" > fi > > + # checkout.guess = false disables DWIM, but with lower priority than > + # --guess/--no-guess > + if [ "$(__git config --type=bool checkout.guess)" = "false" ]; then > + dwim_opt="" > + fi > + > # Find the last provided --guess or --no-guess > last_option="$(__git_find_last_on_cmdline "--guess --no-guess")" > case "$last_option" in > diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh > index accfa9aa4b..a4f8d3a67e 100755 > --- a/t/t2024-checkout-dwim.sh > +++ b/t/t2024-checkout-dwim.sh > @@ -166,6 +166,17 @@ test_expect_success '--no-guess suppresses branch auto-vivification' ' > test_branch master > ' > > +test_expect_success 'checkout.guess = false suppresses branch auto-vivification' ' > + git checkout -B master && > + status_uno_is_clean && > + test_might_fail git branch -D bar && > + > + test_config checkout.guess false && > + test_must_fail git checkout bar && > + test_must_fail git rev-parse --verify refs/heads/bar && > + test_branch master > +' > + > test_expect_success 'setup more remotes with unconventional refspecs' ' > git checkout -B master && > status_uno_is_clean && > diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh > index 2c1b8c0d6d..68c9101b02 100755 > --- a/t/t2060-switch.sh > +++ b/t/t2060-switch.sh > @@ -85,9 +85,12 @@ test_expect_success 'switching ignores file of same branch name' ' > test_cmp expected actual > ' > > -test_expect_success 'guess and create branch ' ' > +test_expect_success 'guess and create branch' ' > test_when_finished git switch master && > test_must_fail git switch --no-guess foo && > + test_config checkout.guess false && > + test_must_fail git switch foo && > + test_config checkout.guess true && > git switch foo && > echo refs/heads/foo >expected && > git symbolic-ref HEAD >actual && > diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh > index 8425b9a531..2b469a71ca 100755 > --- a/t/t9902-completion.sh > +++ b/t/t9902-completion.sh > @@ -1360,6 +1360,58 @@ test_expect_success 'git checkout - a later --no-guess overrides previous --gues > EOF > ' > > +test_expect_success 'git checkout - with checkout.guess = false, only completes refs' ' > + test_config checkout.guess false && > + test_completion "git checkout " <<-\EOF > + HEAD Z > + master Z > + matching-branch Z > + matching-tag Z > + other/branch-in-other Z > + other/master-in-other Z > + EOF > +' > + > +test_expect_success 'git checkout - with checkout.guess = true, completes refs and unique remote branches for DWIM' ' > + test_config checkout.guess true && > + test_completion "git checkout " <<-\EOF > + HEAD Z > + branch-in-other Z > + master Z > + master-in-other Z > + matching-branch Z > + matching-tag Z > + other/branch-in-other Z > + other/master-in-other Z > + EOF > +' > + > +test_expect_success 'git checkout - a later --guess overrides previous checkout.guess = false, complete refs and unique remote branches for DWIM' ' > + test_config checkout.guess false && > + test_completion "git checkout --guess " <<-\EOF > + HEAD Z > + branch-in-other Z > + master Z > + master-in-other Z > + matching-branch Z > + matching-tag Z > + other/branch-in-other Z > + other/master-in-other Z > + EOF > +' > + > +test_expect_success 'git checkout - a later --no-guess overrides previous checkout.guess = true, complete only refs' ' > + test_config checkout.guess true && > + test_completion "git checkout --no-guess " <<-\EOF > + HEAD Z > + master Z > + matching-branch Z > + matching-tag Z > + other/branch-in-other Z > + other/master-in-other Z > + EOF > +' > + > test_expect_success 'git switch - with --detach, complete all references' ' > test_completion "git switch --detach " <<-\EOF > HEAD Z
Hi Junio, On Sun, Oct 04, 2020 at 10:46:14AM -0700, Junio C Hamano wrote: > Denton Liu <liu.denton@gmail.com> writes: > > > The current behavior of git checkout/switch is that --guess is currently > > enabled by default. However, some users may not wish for this to happen > > automatically. Instead of forcing users to specify --no-guess manually > > each time, teach these commands the checkout.guess configuration > > variable that gives users the option to set a default behavior. > > > > Teach the completion script to recognize the new config variable and > > disable DWIM logic if it is set to false. > > > > Signed-off-by: Denton Liu <liu.denton@gmail.com> > > --- > > Asking for input from Dscho on how to futureproof the tests along > the same line as js/default-branch-name-part-2 topic. Perhaps we could extract lists that are repeated often into common files so that they only need to be changed in one place? Something like this: -- >8 -- diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 7b7bc6e4bd..86da44231d 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1240,8 +1240,8 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' ' test_cmp expected out ' -test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' ' - test_completion "git switch " <<-\EOF +test_expect_success 'prepare expect files for DWIM tests' ' + cat >local-and-unique-remote <<-\EOF && branch-in-other Z master Z master-in-other Z @@ -1249,6 +1249,10 @@ test_expect_success 'git switch - with no options, complete local branches and u EOF ' +test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' ' + test_completion "git switch " <local-and-unique-remote +' + test_expect_success 'git checkout - completes refs and unique remote branches for DWIM' ' test_completion "git checkout " <<-\EOF HEAD Z
Denton Liu <liu.denton@gmail.com> writes: > Hi Junio, > > On Sun, Oct 04, 2020 at 10:46:14AM -0700, Junio C Hamano wrote: >> Denton Liu <liu.denton@gmail.com> writes: >> >> > The current behavior of git checkout/switch is that --guess is currently >> > enabled by default. However, some users may not wish for this to happen >> > automatically. Instead of forcing users to specify --no-guess manually >> > each time, teach these commands the checkout.guess configuration >> > variable that gives users the option to set a default behavior. >> > >> > Teach the completion script to recognize the new config variable and >> > disable DWIM logic if it is set to false. >> > >> > Signed-off-by: Denton Liu <liu.denton@gmail.com> >> > --- >> >> Asking for input from Dscho on how to futureproof the tests along >> the same line as js/default-branch-name-part-2 topic. > > Perhaps we could extract lists that are repeated often into common files > so that they only need to be changed in one place? Something like this: or we can feed a prefix that is not 'm' so that master, main, or maint branches are not involved at all in the completion? > > -- >8 -- > diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh > index 7b7bc6e4bd..86da44231d 100755 > --- a/t/t9902-completion.sh > +++ b/t/t9902-completion.sh > @@ -1240,8 +1240,8 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' ' > test_cmp expected out > ' > > -test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' ' > - test_completion "git switch " <<-\EOF > +test_expect_success 'prepare expect files for DWIM tests' ' > + cat >local-and-unique-remote <<-\EOF && > branch-in-other Z > master Z > master-in-other Z > @@ -1249,6 +1249,10 @@ test_expect_success 'git switch - with no options, complete local branches and u > EOF > ' > > +test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' ' > + test_completion "git switch " <local-and-unique-remote > +' > + > test_expect_success 'git checkout - completes refs and unique remote branches for DWIM' ' > test_completion "git checkout " <<-\EOF > HEAD Z
Hi, On Tue, 6 Oct 2020, Junio C Hamano wrote: > Denton Liu <liu.denton@gmail.com> writes: > > > On Sun, Oct 04, 2020 at 10:46:14AM -0700, Junio C Hamano wrote: > >> Denton Liu <liu.denton@gmail.com> writes: > >> > >> > The current behavior of git checkout/switch is that --guess is currently > >> > enabled by default. However, some users may not wish for this to happen > >> > automatically. Instead of forcing users to specify --no-guess manually > >> > each time, teach these commands the checkout.guess configuration > >> > variable that gives users the option to set a default behavior. > >> > > >> > Teach the completion script to recognize the new config variable and > >> > disable DWIM logic if it is set to false. > >> > > >> > Signed-off-by: Denton Liu <liu.denton@gmail.com> > >> > --- > >> > >> Asking for input from Dscho on how to futureproof the tests along > >> the same line as js/default-branch-name-part-2 topic. > > > > Perhaps we could extract lists that are repeated often into common files > > so that they only need to be changed in one place? Something like this: > > or we can feed a prefix that is not 'm' so that master, main, or > maint branches are not involved at all in the completion? While I appreciate the consideration, the issue should be easy enough to address. I don't think we need to worry too much about that in the context of this here patch series. Ciao, Dscho > > > > > -- >8 -- > > diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh > > index 7b7bc6e4bd..86da44231d 100755 > > --- a/t/t9902-completion.sh > > +++ b/t/t9902-completion.sh > > @@ -1240,8 +1240,8 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' ' > > test_cmp expected out > > ' > > > > -test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' ' > > - test_completion "git switch " <<-\EOF > > +test_expect_success 'prepare expect files for DWIM tests' ' > > + cat >local-and-unique-remote <<-\EOF && > > branch-in-other Z > > master Z > > master-in-other Z > > @@ -1249,6 +1249,10 @@ test_expect_success 'git switch - with no options, complete local branches and u > > EOF > > ' > > > > +test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' ' > > + test_completion "git switch " <local-and-unique-remote > > +' > > + > > test_expect_success 'git checkout - completes refs and unique remote branches for DWIM' ' > > test_completion "git checkout " <<-\EOF > > HEAD Z >
diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt index e3684a5459..2cddf7b4b4 100644 --- a/Documentation/config/checkout.txt +++ b/Documentation/config/checkout.txt @@ -16,3 +16,8 @@ will checkout the `<something>` branch on another remote, and by linkgit:git-worktree[1] when `git worktree add` refers to a remote branch. This setting might be used for other checkout-like commands or functionality in the future. + +checkout.guess:: + Provides the default value for the `--guess` or `--no-guess` + option in `git checkout` and `git switch`. See + linkgit:git-switch[1] and linkgit:git-checkout[1]. diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index afa5c11fd3..28f656d04e 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -193,6 +193,9 @@ branches from there if `<branch>` is ambiguous but exists on the linkgit:git-config[1]. + Use `--no-guess` to disable this. ++ +The default behavior can be set via the `checkout.guess` configuration +variable. -l:: Create the new branch's reflog; see linkgit:git-branch[1] for diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt index 3759c3a265..5c438cd505 100644 --- a/Documentation/git-switch.txt +++ b/Documentation/git-switch.txt @@ -103,6 +103,9 @@ ambiguous but exists on the 'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]. + `--guess` is the default behavior. Use `--no-guess` to disable it. ++ +The default behavior can be set via the `checkout.guess` configuration +variable. -f:: --force:: diff --git a/builtin/checkout.c b/builtin/checkout.c index 0951f8fee5..0c0394a0d6 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1093,11 +1093,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); diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 8be4a0316e..45ecbb9849 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1470,11 +1470,12 @@ _git_bundle () # To decide between the following rules in priority order # 1) the last provided of "--guess" or "--no-guess" explicitly enable or # disable completion of DWIM logic respectively. -# 2) If the --no-track option is provided, take this as a hint to disable the +# 2) If checkout.guess is false, disable completion of DWIM logic. +# 3) If the --no-track option is provided, take this as a hint to disable the # DWIM completion logic -# 3) If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion +# 4) If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion # logic, as requested by the user. -# 4) Enable DWIM logic otherwise. +# 5) Enable DWIM logic otherwise. # __git_checkout_default_dwim_mode () { @@ -1485,11 +1486,17 @@ __git_checkout_default_dwim_mode () fi # --no-track disables DWIM, but with lower priority than - # --guess/--no-guess + # --guess/--no-guess/checkout.guess if [ -n "$(__git_find_on_cmdline "--no-track")" ]; then dwim_opt="" fi + # checkout.guess = false disables DWIM, but with lower priority than + # --guess/--no-guess + if [ "$(__git config --type=bool checkout.guess)" = "false" ]; then + dwim_opt="" + fi + # Find the last provided --guess or --no-guess last_option="$(__git_find_last_on_cmdline "--guess --no-guess")" case "$last_option" in diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh index accfa9aa4b..a4f8d3a67e 100755 --- a/t/t2024-checkout-dwim.sh +++ b/t/t2024-checkout-dwim.sh @@ -166,6 +166,17 @@ test_expect_success '--no-guess suppresses branch auto-vivification' ' test_branch master ' +test_expect_success 'checkout.guess = false suppresses branch auto-vivification' ' + git checkout -B master && + status_uno_is_clean && + test_might_fail git branch -D bar && + + test_config checkout.guess false && + test_must_fail git checkout bar && + test_must_fail git rev-parse --verify refs/heads/bar && + test_branch master +' + test_expect_success 'setup more remotes with unconventional refspecs' ' git checkout -B master && status_uno_is_clean && diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh index 2c1b8c0d6d..68c9101b02 100755 --- a/t/t2060-switch.sh +++ b/t/t2060-switch.sh @@ -85,9 +85,12 @@ test_expect_success 'switching ignores file of same branch name' ' test_cmp expected actual ' -test_expect_success 'guess and create branch ' ' +test_expect_success 'guess and create branch' ' test_when_finished git switch master && test_must_fail git switch --no-guess foo && + test_config checkout.guess false && + test_must_fail git switch foo && + test_config checkout.guess true && git switch foo && echo refs/heads/foo >expected && git symbolic-ref HEAD >actual && diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 8425b9a531..2b469a71ca 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1360,6 +1360,58 @@ test_expect_success 'git checkout - a later --no-guess overrides previous --gues EOF ' +test_expect_success 'git checkout - with checkout.guess = false, only completes refs' ' + test_config checkout.guess false && + test_completion "git checkout " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - with checkout.guess = true, completes refs and unique remote branches for DWIM' ' + test_config checkout.guess true && + test_completion "git checkout " <<-\EOF + HEAD Z + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - a later --guess overrides previous checkout.guess = false, complete refs and unique remote branches for DWIM' ' + test_config checkout.guess false && + test_completion "git checkout --guess " <<-\EOF + HEAD Z + branch-in-other Z + master Z + master-in-other Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + +test_expect_success 'git checkout - a later --no-guess overrides previous checkout.guess = true, complete only refs' ' + test_config checkout.guess true && + test_completion "git checkout --no-guess " <<-\EOF + HEAD Z + master Z + matching-branch Z + matching-tag Z + other/branch-in-other Z + other/master-in-other Z + EOF +' + test_expect_success 'git switch - with --detach, complete all references' ' test_completion "git switch --detach " <<-\EOF HEAD Z
The current behavior of git checkout/switch is that --guess is currently enabled by default. However, some users may not wish for this to happen automatically. Instead of forcing users to specify --no-guess manually each time, teach these commands the checkout.guess configuration variable that gives users the option to set a default behavior. Teach the completion script to recognize the new config variable and disable DWIM logic if it is set to false. Signed-off-by: Denton Liu <liu.denton@gmail.com> --- Documentation/config/checkout.txt | 5 +++ Documentation/git-checkout.txt | 3 ++ Documentation/git-switch.txt | 3 ++ builtin/checkout.c | 7 +++- contrib/completion/git-completion.bash | 15 ++++++-- t/t2024-checkout-dwim.sh | 11 ++++++ t/t2060-switch.sh | 5 ++- t/t9902-completion.sh | 52 ++++++++++++++++++++++++++ 8 files changed, 95 insertions(+), 6 deletions(-)