undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

completion: remove broken dead code from __git_heads() and __git_tags()

Browse Source 
__git_heads() was introduced in 5de40f5 (Teach bash about
git-repo-config., 2006-11-27), and __git_tags() in 88e21dc (Teach bash
about completing arguments for git-tag, 2007-08-31).  As their name
suggests, __git_heads() is supposed to list only branches, and
__git_tags() only tags.

Since their introduction both of these functions consist of two
distinct parts.  The first part gets branches or tags, respectively,
from a local repositoty using 'git for-each-ref'.  The second part
queries a remote repository given as argument using 'git ls-remote'.

These remote-querying parts are broken in both functions since their
introduction, because they list both branches and tags from the remote
repository.  (The 'git ls-remote' query is not limited to list only
heads or tags, respectively, and the for loop filtering the query
results prints everything except dereferenced tags.)  This breakage
could be easily fixed by passing the '--heads' or '--tags' options or
appropriate refs patterns to the 'git ls-remote' invocations.

However, that no one noticed this breakage yet is probably not a
coincidence: neither of these two functions were used to query a
remote repository, the remote-querying parts were dead code already
upon thier introduction and remained dead ever since.

Since those parts of code are broken, are and were never used, stop
the bit-rotting and remove them.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
SZEDER Gábor 2011-10-08 16:54:43 +02:00 committed by Junio C Hamano
parent d51a8ecd5f
commit 6486ca6d77
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/completion/git-completion.bash
View File

@ -537,42 +537,24 @@ __gitcomp_nl ()
COMPREPLY=($(compgen -P "${2-}" -S "$suffix" -W "$1" -- "$cur_")) COMPREPLY=($(compgen -P "${2-}" -S "$suffix" -W "$1" -- "$cur_"))
} }
# __git_heads accepts 0 or 1 arguments (to pass to __gitdir)
__git_heads () __git_heads ()
{ {
local cmd i is_hash=y dir="$(__gitdir "${1-}")" local dir="$(__gitdir)"
if [ -d "$dir" ]; then if [ -d "$dir" ]; then
git --git-dir="$dir" for-each-ref --format='%(refname:short)' \ git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
refs/heads refs/heads
return return
fi fi
for i in $(git ls-remote "${1-}" 2>/dev/null); do
case "$is_hash,$i" in
y,*) is_hash=n ;;
n,*^{}) is_hash=y ;;
n,refs/heads/*) is_hash=y; echo "${i#refs/heads/}" ;;
n,*) is_hash=y; echo "$i" ;;
esac
done
} }
# __git_tags accepts 0 or 1 arguments (to pass to __gitdir)
__git_tags () __git_tags ()
{ {
local cmd i is_hash=y dir="$(__gitdir "${1-}")" local dir="$(__gitdir)"
if [ -d "$dir" ]; then if [ -d "$dir" ]; then
git --git-dir="$dir" for-each-ref --format='%(refname:short)' \ git --git-dir="$dir" for-each-ref --format='%(refname:short)' \
refs/tags refs/tags
return return
fi fi
for i in $(git ls-remote "${1-}" 2>/dev/null); do
case "$is_hash,$i" in
y,*) is_hash=n ;;
n,*^{}) is_hash=y ;;
n,refs/tags/*) is_hash=y; echo "${i#refs/tags/}" ;;
n,*) is_hash=y; echo "$i" ;;
esac
done
} }
# __git_refs accepts 0, 1 (to pass to __gitdir), or 2 arguments # __git_refs accepts 0, 1 (to pass to __gitdir), or 2 arguments