Merge f25edf653f into 028d653632

.github/dependencies.yml

@@ -2,13 +2,11 @@ dependencies:
   plugins/gitfast:
     repo: felipec/git-completion
     branch: master
-    version: tag:v2.2
+    version: tag:v2.1
     postcopy: |
       set -e
-      rm -rf git-completion.plugin.zsh Makefile t tools
-      mv README.adoc MANUAL.adoc
-      mv -f src/* .
-      rmdir src
+      rm -rf git-completion.plugin.zsh Makefile README.adoc t tools
+      test -e git-completion.zsh && mv -f git-completion.zsh _git
   plugins/gradle:
     repo: gradle/gradle-completion
     branch: master

.github/workflows/dependencies/requirements.txt

@@ -3,5 +3,5 @@ charset-normalizer==3.4.1
 idna==3.10
 PyYAML==6.0.2
 requests==2.32.3
-semver==3.0.3
+semver==3.0.2
 urllib3==2.3.0

plugins/gitfast/MANUAL.adoc

@@ -1,40 +0,0 @@
-This project is a friendly fork of the official Git completion
-(`contrib/completion`) and prompt scripts for Bash, Zsh, and possibly other
-shells.
-
-Most Git developers use the Bash shell, for which the completion scripts work
-rather well, however, Zsh is typically neglected. I've sent many patches to fix
-the issues, many have been merged, but many have been ignored, thus the need for
-a canonical location of a good, working Zsh completion.
-
-There are advantages for Bash users too. Currently the scripts under `contrib` are tied to the
-specific Git version, for example the completion scripts of version v2.40
-(https://git.kernel.org/pub/scm/git/git.git/plain/contrib/completion/git-completion.bash?h=v2.40.0[git-completion.bash])
-have issues with older versions of Git (e.g. v2.33); the ones in
-this project don't.
-
-With `git-completion` you can be sure you are using the latest completion that
-works in both shells, and any Git version.
-
-This is a sister project of the
-https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/gitfast[Oh My Zsh
-gitfast] plugin (that I also maintain), which has similar needs.
-
-== Installation ==
-
-* https://github.com/felipec/git-completion/wiki/Bash[Bash instructions]
-* https://github.com/felipec/git-completion/wiki/Zsh[Zsh instructions]
-
-== Improvements from upstream ==
-
-This is a short list of the benefits you get:
-
-* Easier installation
-* Tons of bug fixes
-* Works with older versions of git
-* Zsh: much more options
-* Zsh: quoting works properly
-* Zsh: automatic suffix removal
-
-For a full list of all the patches on top of upstream git check
-https://github.com/felipec/git-completion/wiki/Patches[Patches].

plugins/gitfast/_git

@@ -2,11 +2,23 @@
 
 # zsh completion wrapper for git
 #
-# Copyright (c) 2012-2024 Felipe Contreras <felipe.contreras@gmail.com>
+# Copyright (c) 2012-2020 Felipe Contreras <felipe.contreras@gmail.com>
 #
-# The recommended way to use this script is to prepend its location to your $fpath:
+# The recommended way to install this script is to make a copy of it as a
+# file named '_git' inside any directory in your fpath.
 #
-#  fpath=($git_completion_srcdir $fpath)
+# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
+# and then add the following to your ~/.zshrc file:
+#
+#  fpath=(~/.zsh $fpath)
+#
+# You need git's bash completion script installed. By default bash-completion's
+# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
+#
+# If your bash completion script is somewhere else, you can specify the
+# location in your ~/.zshrc:
+#
+#  zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
 #
 
 zstyle -T ':completion:*:*:git:*' tag-order && \

plugins/gitfast/git-completion.bash

@@ -1,8 +1,6 @@
 # bash/zsh completion support for core Git.
 #
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
-# Copyright (c) 2012-2024 Felipe Contreras <felipe.contreras@gmail.com>
-#
 # Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
 # Distributed under the GNU General Public License, version 2.0.
 #