diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2020-06-30 16:49:13 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2020-06-30 16:57:32 +0200 |
| commit | c2242d6dfe732e7b434b41783125910d402f9be9 (patch) | |
| tree | 50e636869f89e05a5cd6d42704a177d3e571024a | |
| parent | e8d6bb612d4385e78c360171a7bb42819b572a8f (diff) | |
| download | zsh-c2242d6dfe732e7b434b41783125910d402f9be9.tar.gz zsh-c2242d6dfe732e7b434b41783125910d402f9be9.zip | |
Cherry-pick 754658af from upstream to fix "git stash drop" tab-completion
See https://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=46093 ff.
This is the upstream commit without the changes to upstream Changelog
file.
| -rw-r--r-- | debian/patches/cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch b/debian/patches/cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch new file mode 100644 index 000000000..44961e303 --- /dev/null +++ b/debian/patches/cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch @@ -0,0 +1,22 @@ +Origin: 754658aff38e1bdf487c58bec6174cbecd019d11 +Author: dana <dana@dana.is> +Date: Fri Mar 13 09:46:14 2020 -0500 +Description: _git: Fix copy/paste error in earlier commit that broke `git stash drop` + This was broken by workers/44923 (8aa84bd5fc44) +Reviewed-By: Axel Beckert <abe@debian.org> +Comment: This is the upstream commit without the changes to upstream Changelog file. +Bug: https://www.zsh.org/cgi-bin/mla/redirect?WORKERNUMBER=46093 + +diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git +index 8487ebc1a..9a44ddbbe 100644 +--- a/Completion/Unix/Command/_git ++++ b/Completion/Unix/Command/_git +@@ -1809,7 +1809,7 @@ _git-stash () { + _nothing + ;; + (drop) +- _arguments -S $endopt \_git-notes ++ _arguments -S $endopt \ + '(-q --quiet)'{-q,--quiet}'[suppress all output]' \ + ':: :__git_stashes' && ret=0 + ;; diff --git a/debian/patches/series b/debian/patches/series index 4310546b8..b5b21fc96 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ cross-compile.diff example-shebang.patch completion-dscverify.diff cherry-pick-d128bc0b-45731-debsnap-new-completion-function.patch +cherry-pick-754658af-Fix-copy-paste-error-in-earlier-commit-that-broke-git-stash-drop-completion.patch |