diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:34 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:34 -0800 |
commit | 8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a (patch) | |
tree | 35158bce87365f3c6e38faa7c0df54337b3fa637 /t/t9902-completion.sh | |
parent | Merge branch 'ab/push-dwim-dst' (diff) | |
parent | checkout: disambiguate dwim tracking branches and local files (diff) | |
download | tgif-8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a.tar.xz |
Merge branch 'nd/checkout-dwim-fix'
"git checkout frotz" (without any double-dash) avoids ambiguity by
making sure 'frotz' cannot be interpreted as a revision and as a
path at the same time. This safety has been updated to check also
a unique remote-tracking branch 'frotz' in a remote, when dwimming
to create a local branch 'frotz' out of a remote-tracking branch
'frotz' from a remote.
* nd/checkout-dwim-fix:
checkout: disambiguate dwim tracking branches and local files
Diffstat (limited to 't/t9902-completion.sh')
-rwxr-xr-x | t/t9902-completion.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 137fdc9bd5..6558eee499 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1434,7 +1434,8 @@ test_expect_success 'double dash "git checkout"' ' --ignore-other-worktrees Z --recurse-submodules Z --progress Z - --no-quiet Z + --guess Z + --no-guess Z --no-... Z EOF ' |