Diff
1diff --git a/.github/dependencies.yml b/.github/dependencies.yml
2index 2c92aee52a2873afbe46bb27c9e5ae0368219f75..02995d6cd24bd75015eaebded21c764cdead37d9 100644
3--- a/.github/dependencies.yml
4+++ b/.github/dependencies.yml
5@@ -2,7 +2,7 @@ dependencies:
6 plugins/gitfast:
7 repo: felipec/git-completion
8 branch: master
9- version: tag:v2.1
10+ version: tag:v2.2
11 postcopy: |
12 set -e
13 rm -rf git-completion.plugin.zsh Makefile t tools
14diff --git a/plugins/gitfast/MANUAL.adoc b/plugins/gitfast/MANUAL.adoc
15new file mode 100644
16index 0000000000000000000000000000000000000000..5333f5a2cc034d28cccfe8d645b93cbb160933f8
17--- /dev/null
18+++ b/plugins/gitfast/MANUAL.adoc
19@@ -0,0 +1,40 @@
20+This project is a friendly fork of the official Git completion
21+(`contrib/completion`) and prompt scripts for Bash, Zsh, and possibly other
22+shells.
23+
24+Most Git developers use the Bash shell, for which the completion scripts work
25+rather well, however, Zsh is typically neglected. I've sent many patches to fix
26+the issues, many have been merged, but many have been ignored, thus the need for
27+a canonical location of a good, working Zsh completion.
28+
29+There are advantages for Bash users too. Currently the scripts under `contrib` are tied to the
30+specific Git version, for example the completion scripts of version v2.40
31+(https://git.kernel.org/pub/scm/git/git.git/plain/contrib/completion/git-completion.bash?h=v2.40.0[git-completion.bash])
32+have issues with older versions of Git (e.g. v2.33); the ones in
33+this project don't.
34+
35+With `git-completion` you can be sure you are using the latest completion that
36+works in both shells, and any Git version.
37+
38+This is a sister project of the
39+https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/gitfast[Oh My Zsh
40+gitfast] plugin (that I also maintain), which has similar needs.
41+
42+== Installation ==
43+
44+* https://github.com/felipec/git-completion/wiki/Bash[Bash instructions]
45+* https://github.com/felipec/git-completion/wiki/Zsh[Zsh instructions]
46+
47+== Improvements from upstream ==
48+
49+This is a short list of the benefits you get:
50+
51+* Easier installation
52+* Tons of bug fixes
53+* Works with older versions of git
54+* Zsh: much more options
55+* Zsh: quoting works properly
56+* Zsh: automatic suffix removal
57+
58+For a full list of all the patches on top of upstream git check
59+https://github.com/felipec/git-completion/wiki/Patches[Patches].
60diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git
61index 31bf88c1c53a2a6f251b96125237ba854ede69e9..1283c713e1e57cbe0ee2367c92d23fff470a4dd4 100644
62--- a/plugins/gitfast/_git
63+++ b/plugins/gitfast/_git
64@@ -2,23 +2,11 @@
65
66 # zsh completion wrapper for git
67 #
68-# Copyright (c) 2012-2020 Felipe Contreras <felipe.contreras@gmail.com>
69+# Copyright (c) 2012-2024 Felipe Contreras <felipe.contreras@gmail.com>
70 #
71-# The recommended way to install this script is to make a copy of it as a
72-# file named '_git' inside any directory in your fpath.
73+# The recommended way to use this script is to prepend its location to your $fpath:
74 #
75-# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
76-# and then add the following to your ~/.zshrc file:
77-#
78-# fpath=(~/.zsh $fpath)
79-#
80-# You need git's bash completion script installed. By default bash-completion's
81-# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
82-#
83-# If your bash completion script is somewhere else, you can specify the
84-# location in your ~/.zshrc:
85-#
86-# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
87+# fpath=($git_completion_srcdir $fpath)
88 #
89
90 zstyle -T ':completion:*:*:git:*' tag-order && \
91diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash
92index 9a2045f26d8b92895e237c7dc4caf3ca9f553bda..8a790ca69c4b0b4809918a0a3f94fb3706382deb 100644
93--- a/plugins/gitfast/git-completion.bash
94+++ b/plugins/gitfast/git-completion.bash
95@@ -1,6 +1,8 @@
96 # bash/zsh completion support for core Git.
97 #
98 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
99+# Copyright (c) 2012-2024 Felipe Contreras <felipe.contreras@gmail.com>
100+#
101 # Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
102 # Distributed under the GNU General Public License, version 2.0.
103 #