diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-04 21:33:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 21:33:34 (GMT) |
| commit | 8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a (patch) | |
| tree | 35158bce87365f3c6e38faa7c0df54337b3fa637 /t/t9902-completion.sh | |
| parent | 0a84724bf8ed1240b61e2401aec8a6cab93111b1 (diff) | |
| parent | be4908f1038861892878db29441be5a4a024784d (diff) | |
| download | git-8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a.zip git-8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a.tar.gz git-8d7f9dbf84fca7158dbbc69af1ac4002396a4d9a.tar.bz2 | |
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 137fdc9..6558eee 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 ' |