mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
completion: don't disambiguate tags and branches
When the completion script has to list only tags or only branches, it uses the 'git for-each-ref' format 'refname:short', which makes sure that all listed tags and branches are unambiguous. However, disambiguating tags and branches in these cases is wrong, because: - __git_tags(), the helper function listing possible tagname arguments for 'git tag', lists an ambiguous tag 'refs/tags/ambiguous' as 'tags/ambiguous'. Its only consumer, 'git tag' expects its tagname argument to be under 'refs/tags/', thus it interprets that abgiguous tag as 'refs/tags/tags/ambiguous'. Clearly wrong. - __git_heads() lists possible branchname arguments for 'git branch' and possible 'branch.<branchname>' configuration subsections. Both of these expect branchnames to be under 'refs/heads/' and misinterpret a disambiguated branchname like 'heads/ambiguous'. Furthermore, disambiguation involves several stat() syscalls for each tag or branch, thus comes at a steep cost especially on Windows and/or when there are a lot of tags or branches to be listed. Use the 'git for-each-ref' format 'refname:strip=2' instead of 'refname:short' to avoid harmful disambiguation of tags and branches in __git_tags() and __git_heads(). Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
aed3881359
commit
3ad8ea7ccc
1 changed files with 2 additions and 2 deletions
|
@ -340,12 +340,12 @@ __git_index_files ()
|
|||
|
||||
__git_heads ()
|
||||
{
|
||||
__git for-each-ref --format='%(refname:short)' refs/heads
|
||||
__git for-each-ref --format='%(refname:strip=2)' refs/heads
|
||||
}
|
||||
|
||||
__git_tags ()
|
||||
{
|
||||
__git for-each-ref --format='%(refname:short)' refs/tags
|
||||
__git for-each-ref --format='%(refname:strip=2)' refs/tags
|
||||
}
|
||||
|
||||
# Lists refs from the local (by default) or from a remote repository.
|
||||
|
|
Loading…
Reference in a new issue