diff options
author | Oliver Kiddle <opk@zsh.org> | 2016-08-22 11:54:04 +0200 |
---|---|---|
committer | Oliver Kiddle <opk@zsh.org> | 2016-08-22 11:54:04 +0200 |
commit | 18aa25c75d84b86be15a934554d3c829926a4066 (patch) | |
tree | 52db66868e1d147ed35ac59720cfb2f37498f20f | |
parent | c8b228b1ea99d6c9d893b72b2fe05eaf4a16a10f (diff) | |
download | zsh-18aa25c75d84b86be15a934554d3c829926a4066.tar.gz zsh-18aa25c75d84b86be15a934554d3c829926a4066.tar.xz zsh-18aa25c75d84b86be15a934554d3c829926a4066.zip |
unposted (c.f. Mikael: 39078): fix for git blame terms
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Completion/Unix/Command/_git | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 39d0aa033..3c54cb9ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-08-22 Oliver Kiddle <opk@zsh.org> + + * unposted (c.f. Mikael: 39078): Completion/Unix/Command/_git: + fix for git blame terms + 2016-08-22 Daniel Shahaf <d.s@daniel.shahaf.name> * unposted: Completion/Unix/Command/_git: _git-config: diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 4a7c9b4ca..304d6eb59 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -194,8 +194,8 @@ _git-bisect () { declare -A opt_args local good bad - if good=$(_call_program commands git terms --term-good); then - bad=$(_call_program commands git terms --term-bad) + if good=$(_call_program commands git bisect terms --term-good); then + bad=$(_call_program commands git bisect terms --term-bad) else good=( good old ) bad=( new bad ) fi @@ -249,7 +249,7 @@ _git-bisect () { ;; esac ;; - (${(j.|.)~bad}|${(j.|.)~good}|skip) + (${(~j.|.)bad}|${(~j.|.)good}|skip) # TODO: skip can take revlists. _arguments \ '*: :__git_commits' && ret=0 |