diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-10-25 18:39:31 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-10-25 18:39:34 +0000 |
| commit | f8b2c13c97228c9a1a0319f07d1ae7c1268e12db (patch) | |
| tree | f7b8134b7673ac21c2cf7a19dd0903bd99bc86c0 | |
| parent | a40417929cb6f94ccd8fb5af78aa47ff69a785c0 (diff) | |
| download | zsh-f8b2c13c97228c9a1a0319f07d1ae7c1268e12db.tar.gz zsh-f8b2c13c97228c9a1a0319f07d1ae7c1268e12db.tar.xz zsh-f8b2c13c97228c9a1a0319f07d1ae7c1268e12db.zip | |
unposted: _git: Fix 'commit object name' completion messages.
Offer the "this alternative is still valid, but I don't know to offer completions for it" for hash completion but not for recent object completion; the former is protected by a _guard and the latter incorrectly appeared also in cases such as 'git log a/b<TAB>' which were not the start of a gitrevisions(7) expression.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 8bf01dc3f..812ef3540 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-10-25 Daniel Shahaf <d.s@daniel.shahaf.name> + + * unposted: Completion/Unix/Command/_git: _git: Fix 'commit + object name' completion messages. + 2015-10-25 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> * 36911: Src/Zle/computil.c: '-optarg' should not match diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 719d717d7..e38b1c6e7 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -5640,7 +5640,7 @@ __git_commit_objects () { commits=(${(f)"$(_call_program commits git --no-pager log -1000 --all --reflog --format='%h:\[%h\]\ %s\ \(%cr\)')"}) __git_command_successful $pipestatus || return 1 - _describe -V -t commits 'commit object name' commits + _describe -Vx -t commits 'commit object name' commits } (( $+functions[__git_recent_commits] )) || @@ -5704,7 +5704,7 @@ __git_recent_commits () { expl=() _wanted heads expl 'head' compadd "$@" -a - heads && ret=0 expl=() - _describe -Vx -t commits 'recent commit object name' descr && ret=0 + _describe -V -t commits 'recent commit object name' descr && ret=0 return $ret } |