Merge branch 'ab/completion-push-delete-ref'
The completion script (in contrib/) learned to complete "git push --delete b<TAB>" to complete branch name to be deleted. * ab/completion-push-delete-ref: completion: expand "push --delete <remote> <ref>" for refs on that <remote>
This commit is contained in:
commit
f70b541188
@ -709,6 +709,7 @@ __git_complete_remote_or_refspec ()
|
||||
i="${words[c]}"
|
||||
case "$i" in
|
||||
--mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;;
|
||||
-d|--delete) [ "$cmd" = "push" ] && lhs=0 ;;
|
||||
--all)
|
||||
case "$cmd" in
|
||||
push) no_complete_refspec=1 ;;
|
||||
|
@ -1457,4 +1457,38 @@ test_expect_failure 'complete with tilde expansion' '
|
||||
test_completion "git add ~/tmp/" "~/tmp/file"
|
||||
'
|
||||
|
||||
test_expect_success 'setup other remote for remote reference completion' '
|
||||
git remote add other otherrepo &&
|
||||
git fetch other
|
||||
'
|
||||
|
||||
for flag in -d --delete
|
||||
do
|
||||
test_expect_success "__git_complete_remote_or_refspec - push $flag other" '
|
||||
sed -e "s/Z$//" >expected <<-EOF &&
|
||||
master-in-other Z
|
||||
EOF
|
||||
(
|
||||
words=(git push '$flag' other ma) &&
|
||||
cword=${#words[@]} cur=${words[cword-1]} &&
|
||||
__git_complete_remote_or_refspec &&
|
||||
print_comp
|
||||
) &&
|
||||
test_cmp expected out
|
||||
'
|
||||
|
||||
test_expect_failure "__git_complete_remote_or_refspec - push other $flag" '
|
||||
sed -e "s/Z$//" >expected <<-EOF &&
|
||||
master-in-other Z
|
||||
EOF
|
||||
(
|
||||
words=(git push other '$flag' ma) &&
|
||||
cword=${#words[@]} cur=${words[cword-1]} &&
|
||||
__git_complete_remote_or_refspec &&
|
||||
print_comp
|
||||
) &&
|
||||
test_cmp expected out
|
||||
'
|
||||
done
|
||||
|
||||
test_done
|
||||
|
Loading…
Reference in New Issue
Block a user