kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

completion: add case-insensitive match of pseudorefs 

When GIT_COMPLETION_IGNORE_CASE is set, also allow lowercase completion
text like "head" to match uppercase HEAD and other pseudorefs.

Signed-off-by: Alison Winters <alisonatwork@outlook.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Alison Winters 2022-11-21 00:26:59 +00:00 committed by Junio C Hamano
parent 9bab766fb2
commit 9de31f7bd2
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -722,6 +722,7 @@ __git_refs ()
local format refs local format refs
local pfx="${3-}" cur_="${4-$cur}" sfx="${5-}" local pfx="${3-}" cur_="${4-$cur}" sfx="${5-}"
local match="${4-}" local match="${4-}"
local umatch="${4-}"
local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers


__git_find_repo_path __git_find_repo_path
@ -745,12 +746,19 @@ __git_refs ()
fi fi
fi fi


if test "${GIT_COMPLETION_IGNORE_CASE:+1}" = "1"
then
# uppercase with tr instead of ${match,^^} for bash 3.2 compatibility
umatch=$(echo "$match" | tr a-z A-Z 2>/dev/null || echo "$match")
fi

if [ "$list_refs_from" = path ]; then if [ "$list_refs_from" = path ]; then
if [[ "$cur_" == ^* ]]; then if [[ "$cur_" == ^* ]]; then
pfx="$pfx^" pfx="$pfx^"
fer_pfx="$fer_pfx^" fer_pfx="$fer_pfx^"
cur_=${cur_#^} cur_=${cur_#^}
match=${match#^} match=${match#^}
umatch=${umatch#^}
fi fi
case "$cur_" in case "$cur_" in
refs|refs/*) refs|refs/*)
@ -761,7 +769,7 @@ __git_refs ()
*) *)
for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do
case "$i" in case "$i" in
$match*) $match*|$umatch*)
if [ -e "$dir/$i" ]; then if [ -e "$dir/$i" ]; then
echo "$pfx$i$sfx" echo "$pfx$i$sfx"
fi fi
@ -795,7 +803,7 @@ __git_refs ()
*) *)
if [ "$list_refs_from" = remote ]; then if [ "$list_refs_from" = remote ]; then
case "HEAD" in case "HEAD" in
$match*) echo "${pfx}HEAD$sfx" ;; $match*|$umatch*) echo "${pfx}HEAD$sfx" ;;
esac esac
__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \ __git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
${GIT_COMPLETION_IGNORE_CASE+--ignore-case} \ ${GIT_COMPLETION_IGNORE_CASE+--ignore-case} \
@ -804,7 +812,7 @@ __git_refs ()
else else
local query_symref local query_symref
case "HEAD" in case "HEAD" in
$match*) query_symref="HEAD" ;; $match*|$umatch*) query_symref="HEAD" ;;
esac esac
__git ls-remote "$remote" $query_symref \ __git ls-remote "$remote" $query_symref \
"refs/tags/$match*" "refs/heads/$match*" \ "refs/tags/$match*" "refs/heads/$match*" \

15
t/t9902-completion.sh
View File

@ -2270,6 +2270,21 @@ test_expect_success 'checkout matches case insensitively with GIT_COMPLETION_IGN
) )
' '


test_expect_success 'checkout completes pseudo refs' '
test_completion "git checkout H" <<-\EOF
HEAD Z
EOF
'

test_expect_success 'checkout completes pseudo refs case insensitively with GIT_COMPLETION_IGNORE_CASE' '
(
GIT_COMPLETION_IGNORE_CASE=1 &&
test_completion "git checkout h" <<-\EOF
HEAD Z
EOF
)
'

test_expect_success 'git -C <path> checkout uses the right repo' ' test_expect_success 'git -C <path> checkout uses the right repo' '
test_completion "git -C subdir -C subsubdir -C .. -C ../otherrepo checkout b" <<-\EOF test_completion "git -C subdir -C subsubdir -C .. -C ../otherrepo checkout b" <<-\EOF
branch-in-other Z branch-in-other Z