summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-19 01:10:15 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-19 01:10:15 +0000
commit117d3ded00038b5b3ea65d687e43212f624db527 (patch)
tree49653f8140d12028b11740fe5d89325f8347d420
parent123ebafbba738164e8b0894c97dae4e0eaae4a46 (diff)
downloadzsh-117d3ded00038b5b3ea65d687e43212f624db527.tar.gz
zsh-117d3ded00038b5b3ea65d687e43212f624db527.tar.xz
zsh-117d3ded00038b5b3ea65d687e43212f624db527.zip
25487: whitespace changes from Mikael Magnusson.
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git92
2 files changed, 49 insertions, 46 deletions
diff --git a/ChangeLog b/ChangeLog
index 8efbc1195..2e1c4707a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-08-19  Clint Adams  <clint@zsh.org>
 
+	* 25487: Completion/Unix/Command/_git: whitespace changes from
+	Mikael Magnusson.
+
 	* 25486: Completion/Unix/Command/_git: patch to allow --shared to
 	be completed without --local with git clone.
 
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 496195bbf..98eb1e01c 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -4256,54 +4256,54 @@ __git_is_indexed () {
   [[ -n $(git ls-files $REPLY) ]]
 }
 
-  local curcontext=$curcontext ret=1
-
-  # fun with $words[] and $CURRENT to enable completion for args
-  # to git aliases (eg. git co <TAB>)
-  local -A git_aliases
-  # TODO: filling git_aliases like this is ugly. I didn't get it working elegantly.
-  local oifs=$IFS
-  IFS=$'\0'
-  git_aliases=(${=${(0)${(@)${${${(f)"$(git config --get-regexp alias.\*)"}/(#s)alias./}/ /$'\0'}}}})
-  IFS=$oifs ; unset oifs
-
-  if (( CURRENT >= 3 )) && [[ -n ${git_aliases[$words[2]]} ]] ; then
-    local -a tmpwords
-    tmpwords=(${words[1]} ${(z)git_aliases[$words[2]]})
-    if [[ -z "${words[3,-1]}" ]] ; then
-        tmpwords[$(( ${#tmpwords} + 1 ))]=""
-    else
-        tmpwords+=("${words[3,-1]}")
-    fi
-    words=("${tmpwords[@]}")
-    (( CURRENT += ${#${(z)git_aliases[$words[2]]}} - 1 ))
-    unset tmpwords
-  fi
-
-  if [[ $service == git ]]; then
-    local state line
-    declare -A opt_args
-    _arguments -C \
-      '(- :)--version[display version information]' \
-      '(- :)--help[display help message]' \
-      '--exec-path=-[path containing core git-programs]::directory:_directories' \
-      '(-p --paginate)'{-p,--paginate}'[pipe output into $PAGER]' \
-      '--git-dir=-[path to repository]:directory:_directories' \
-      '--bare[use $PWD as repository]' \
-      ':command:->command' \
-      '*::options:->options' && ret=0
-    case $state in
-      (command)
-        __git_aliases_and_commands
-        ;;
-      (options)
-        curcontext="${curcontext%:*:*}:git-$words[1]:"
-        _call_function ret _git-$words[1]
-        ;;
-    esac
+local curcontext=$curcontext ret=1
+
+# fun with $words[] and $CURRENT to enable completion for args
+# to git aliases (eg. git co <TAB>)
+local -A git_aliases
+# TODO: filling git_aliases like this is ugly. I didn't get it working elegantly.
+local oifs=$IFS
+IFS=$'\0'
+git_aliases=(${=${(0)${(@)${${${(f)"$(git config --get-regexp alias.\*)"}/(#s)alias./}/ /$'\0'}}}})
+IFS=$oifs ; unset oifs
+
+if (( CURRENT >= 3 )) && [[ -n ${git_aliases[$words[2]]} ]] ; then
+  local -a tmpwords
+  tmpwords=(${words[1]} ${(z)git_aliases[$words[2]]})
+  if [[ -z "${words[3,-1]}" ]] ; then
+      tmpwords[$(( ${#tmpwords} + 1 ))]=""
   else
-    _call_function ret _$service
+      tmpwords+=("${words[3,-1]}")
   fi
+  words=("${tmpwords[@]}")
+  (( CURRENT += ${#${(z)git_aliases[$words[2]]}} - 1 ))
+  unset tmpwords
+fi
+
+if [[ $service == git ]]; then
+  local state line
+  declare -A opt_args
+  _arguments -C \
+    '(- :)--version[display version information]' \
+    '(- :)--help[display help message]' \
+    '--exec-path=-[path containing core git-programs]::directory:_directories' \
+    '(-p --paginate)'{-p,--paginate}'[pipe output into $PAGER]' \
+    '--git-dir=-[path to repository]:directory:_directories' \
+    '--bare[use $PWD as repository]' \
+    ':command:->command' \
+    '*::options:->options' && ret=0
+  case $state in
+    (command)
+      __git_aliases_and_commands
+      ;;
+    (options)
+      curcontext="${curcontext%:*:*}:git-$words[1]:"
+      _call_function ret _git-$words[1]
+      ;;
+  esac
+else
+  _call_function ret _$service
+fi
 }
 
 _git