completion: improve existence check for pseudo-refs
Improve the existence check along the following lines: - Stop stripping the "ref :" prefix and compare to the expected value directly. This allows us to drop a now-unused variable that was previously leaking into the user's shell. - Mark the "head" variable as local so that we don't leak its value into the user's shell. - Stop manually handling the `-C $__git_repo_path` option, which the `__git ()` wrapper aleady does for us. - In simlar spirit, stop redirecting stderr, which is also handled by the wrapper already. Suggested-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Jan 15, 2024 at 11:36 UTC
7b9cda2d3d7de794974ce6f29a2a838565cd338d
1 file changed
+3
-3
contrib/completion/git-completion.bash
+3
-3
@@ -137,6 +137,7 @@ __git_eread ()
137
__git_pseudoref_exists ()
138
{
139
local ref=$1
140
+ local head
141
142
__git_find_repo_path
143
@@ -146,9 +147,8 @@ __git_pseudoref_exists ()
147
# Bash builtins since executing Git commands are expensive on some
148
# platforms.
149
if __git_eread "$__git_repo_path/HEAD" head; then
149
- b="${head#ref: }"
150
- if [ "$b" == "refs/heads/.invalid" ]; then
151
- __git -C "$__git_repo_path" rev-parse --verify --quiet "$ref" 2>/dev/null
150
+ if [ "$head" == "ref: refs/heads/.invalid" ]; then
151
+ __git rev-parse --verify --quiet "$ref"
152
return $?
153
fi
154
fi