mirror of
https://github.com/TheLocehiliosan/yadm
synced 2024-10-27 20:34:27 +00:00
Fix compatibility bug with Git completions (#318)
Git 2.30.0 removed an internal function yadm completion depended upon. This change retains the old function call for compatibility.
This commit is contained in:
parent
31071d9ac9
commit
c4327d0099
@ -1,10 +1,12 @@
|
|||||||
# test if git completion is missing, but loader exists, attempt to load
|
# test if git completion is missing, but loader exists, attempt to load
|
||||||
if ! declare -F _git > /dev/null && declare -F _completion_loader > /dev/null; then
|
if ! declare -F _git > /dev/null && ! declare -F __git_wrap__git_main > /dev/null; then
|
||||||
_completion_loader git
|
if declare -F _completion_loader > /dev/null; then
|
||||||
|
_completion_loader git
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# only operate if git completion is present
|
# only operate if git completion is present
|
||||||
if declare -F _git > /dev/null; then
|
if declare -F _git > /dev/null || declare -F __git_wrap__git_main > /dev/null; then
|
||||||
|
|
||||||
_yadm() {
|
_yadm() {
|
||||||
|
|
||||||
@ -66,7 +68,11 @@ if declare -F _git > /dev/null; then
|
|||||||
if [[ " ${yadm_switches[*]} " != *" $penultimate "* ]]; then
|
if [[ " ${yadm_switches[*]} " != *" $penultimate "* ]]; then
|
||||||
# TODO: somehow solve the problem with [--yadm-xxx option] being
|
# TODO: somehow solve the problem with [--yadm-xxx option] being
|
||||||
# incompatible with what git expects, namely [--arg=option]
|
# incompatible with what git expects, namely [--arg=option]
|
||||||
_git
|
if declare -F _git > /dev/null; then
|
||||||
|
_git
|
||||||
|
else
|
||||||
|
__git_wrap__git_main
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ "$current" =~ ^- ]]; then
|
if [[ "$current" =~ ^- ]]; then
|
||||||
local matching
|
local matching
|
||||||
|
Loading…
Reference in New Issue
Block a user