bash completion: add support for git 2.30 and on#3342
Open
eli-schwartz wants to merge 1 commit into
Open
Conversation
ches
reviewed
Feb 2, 2024
ches
left a comment
ches
left a comment
There was a problem hiding this comment.
Three years since #2684 (comment) I finally wanted to look into what the proper backward-compatible and API-stable patch should be, and @eli-schwartz has already done the homework.
Thanks and 👍🏼, verified this patch works for me.
| # git < 2.30 | ||
| complete -o bashdefault -o default -o nospace -F _git hub 2>/dev/null \ | ||
| || complete -o default -o nospace -F _git hub | ||
| elif declare -F __git_main; then |
There was a problem hiding this comment.
Suggested change
| elif declare -F __git_main; then | |
| elif declare -F __git_main >/dev/null; then |
Consistent with the preceding conditional branch, this fixes __git_main being echoed during shell session initialization.
Contributor
Author
There was a problem hiding this comment.
In fact, in my local git clone it turns out I had already made this change!! and used it locally. The problem is, that I forgot to git add it...
The _git backwards compat wrapper was dropped upstream: git/git@441ecda Instead, we rely on __git_complete to detect loaded bash completions, since we will use it later on to set up completions -- it is now public API. There is a gap between git 2.30 and 2.31 where _git does not exist, but there is no public API to create completions. Starting 2.31, we are formally permitted to copy/imitate the upstream completions with: ``` __git_complete mycmd git_cmd ``` For 2.30 specifically, we have to pass the internal completion function used instead of "git_cmd", but it's difficult to detect this necessity in a forwards-compatible way. Try it that way first, in the assumption that if the internal completion function still exists it does the same thing.
eli-schwartz
force-pushed
the
git-2.30
branch
from
7b326c7 to
637cbbb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The _git backwards compat wrapper was dropped upstream: git/git@441ecda
Instead, we rely on __git_complete to detect loaded bash completions, since we will use it later on to set up completions -- it is now public API.
There is a gap between git 2.30 and 2.31 where _git does not exist, but there is no public API to create completions. Starting 2.31, we are formally permitted to copy/imitate the upstream completions with:
For 2.30 specifically, we have to pass the internal completion function used instead of "git_cmd", but it's difficult to detect this necessity in a forwards-compatible way. Try it that way first, in the assumption that if the internal completion function still exists it does the same thing.
Closes #2684
Closes #2948