summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index d1696e196..4fe0bf5d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-22  Daniel Hahler  <zsh@thequod.de>
+
+	* 42364: Completion/Unix/Command/_git: _git: fix __git_ignore_line to
+	ignore the current word.
+
 2018-02-17  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 42362: Src/jobs.c: protet REPORTTIME logic from bad status.
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 9f0225fab..4df851c98 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5596,12 +5596,7 @@ __git_describe_commit () {
 # .
 (( $+functions[__git_ignore_line] )) ||
 __git_ignore_line () {
-  declare -a ignored
-  ignored=()
-  ((CURRENT > 1)) &&
-    ignored+=(${(bQ)line[1,CURRENT-1]})
-  ((CURRENT < $#line)) &&
-    ignored+=(${(bQ)line[CURRENT+1,-1]})
+  local -a ignored=(${line:#${words[CURRENT]}})
   $* -F ignored
 }