development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

completion: treat dangling symrefs as existing pseudorefs

Browse source 
The `__git_pseudoref_exists ()` helper function back to git-rev-parse(1)
in case the reftable backend is in use. This is not in the same spirit
as the simple existence check that the "files" backend does though,
because there we only check for the pseudo-ref to exist with `test -f`.
With git-rev-parse(1) we not only check for existence, but also verify
that the pseudo-ref resolves to an object, which may not be the case
when the pseudo-ref points to an unborn branch.

Fix this issue by using `git show-ref --exists` instead. Note that we do
not have to silence stdout anymore as git-show-ref(1) will not print
anything.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2024-01-15 11:36:15 +01:00 committed by Junio C Hamano
parent 9a9c31135e
commit 020e0a087f
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/completion/git-completion.bash
View file

@ -148,7 +148,7 @@ __git_pseudoref_exists ()
# platforms.
if __git_eread "$__git_repo_path/HEAD" head; then
if [ "$head" == "ref: refs/heads/.invalid" ]; then
__git rev-parse --verify --quiet "$ref" >/dev/null
__git show-ref --exists "$ref"
return $?
fi
fi

4
t/t9902-completion.sh
View file

@ -2743,6 +2743,10 @@ test_expect_success '__git_pseudoref_exists' '
cd repo &&
sane_unset __git_repo_path &&
# HEAD should exist, even if it points to an unborn branch.
__git_pseudoref_exists HEAD >output 2>&1 &&
test_must_be_empty output &&
# HEAD points to an existing branch, so it should exist.
test_commit A &&
__git_pseudoref_exists HEAD >output 2>&1 &&