Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git: enable zsh completion #79578

Merged
merged 1 commit into from Feb 9, 2020
Merged

git: enable zsh completion #79578

merged 1 commit into from Feb 9, 2020

Conversation

bdesham
Copy link
Contributor

@bdesham bdesham commented Feb 9, 2020

Motivation for this change

Git ships with a zsh completion script, but this script was previously
only available at $out/share/git/contrib/completion/git-completion.zsh,
which is not a path (or a filename) that would be discovered by a
typical zsh installation. This commit symlinks that file to
$out/share/zsh/site-functions/_git, which is a more standard location.

That zsh completion script is mostly a wrapper around the Bash
completion script, so this commit also patches the former so that it can
"find" the latter.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @peti @the-kenny @wmertens @globin

@bdesham
git: enable zsh completion
a8bdffc 
Git ships with a zsh completion script, but this script was previously
only available at $out/share/git/contrib/completion/git-completion.zsh,
which is not a path (or a filename) that would be discovered by a
typical zsh installation. This commit symlinks that file to
$out/share/zsh/site-functions/_git, which is a more standard location.

That zsh completion script is mostly a wrapper around the Bash
completion script, so this commit also patches the former so that it can
"find" the latter.
@bdesham
Copy link
Contributor Author

bdesham commented Feb 9, 2020

I think the test failures are spurious… it looks like something similar happened in #73861.

@GrahamcOfBorg build git

peti
peti approved these changes Feb 9, 2020
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@FRidh
Copy link
Member

FRidh commented Feb 9, 2020

This needs to target the staging branch.

@FRidh FRidh changed the base branch from master to staging February 9, 2020 08:22
@FRidh FRidh merged commit 35b403b into NixOS:staging Feb 9, 2020
@bdesham bdesham deleted the git-zsh-completion branch February 9, 2020 17:25
@smancill smancill mentioned this pull request Sep 14, 2020
Closed
@worldofpeace worldofpeace mentioned this pull request Sep 14, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti peti approved these changes

@wmertens wmertens Awaiting requested review from wmertens

@globin globin Awaiting requested review from globin

@the-kenny the-kenny Awaiting requested review from the-kenny

Assignees
No one assigned
Labels
10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bdesham @FRidh @peti