diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 911057672..7498e80d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ * 29272: Completion/Unix/Command/_git: Use return values correctly accross all completion functions. + * unposted: Completion/Unix/Command/_git: Move _gitk and _tig to + correct location. + 2011-07-19 Peter Stephenson <pws@csr.com> * 29555: Src/exec.c: fix problem that shell failed to use file @@ -15125,5 +15128,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5399 $ +* $Revision: 1.5400 $ ***************************************************** diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 8f9f6d454..b4fcf07d5 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1579,6 +1579,16 @@ _git-tag () { '*:: :__git_ignore_line_inside_arguments __git_tags' } +(( $+functions[_gitk] )) || +_gitk () { + _git-log +} + +(( $+functions[_tig] )) || +_tig () { + _git-log +} + # Ancillary Commands (Manipulators) (( $+functions[_git-config] )) || @@ -6052,16 +6062,6 @@ __git_color_attributes () { _describe -t attributes attribute attributes $* } -(( $+functions[_gitk] )) || -_gitk () { - _git-log -} - -(( $+functions[_tig] )) || -_tig () { - _git-log -} - # Now, for the main driver… _git() { if (( CURRENT > 2 )); then |