summary refs log tree commit diff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2013-12-30 12:45:53 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2013-12-30 12:45:53 -0800
commitea55ea039d6637436896c415073699aa0b39b6e6 (patch)
treebe46e16c5676b275382223035039a17af310a51c
parente8fb45ef1e1e7a0b9b1411a3ad16df61ea096f41 (diff)
downloadzsh-ea55ea039d6637436896c415073699aa0b39b6e6.tar.gz
zsh-ea55ea039d6637436896c415073699aa0b39b6e6.tar.xz
zsh-ea55ea039d6637436896c415073699aa0b39b6e6.zip
32205: skip cdpath search when prefix begins with "../"
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Zsh/Command/_cd2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bca5d5fa0..d1bd64b3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2013-12-30  Barton E. Schaefer  <schaefer@zsh.org>
 
-	* unposted (cf. Carlo: 32202):  MACHINES: OS X 10.9.1. gcc problem
+	* 32205: Completion/Zsh/Command/_cd: skip cdpath search when
+	the prefix begins with "../" (bug introduced by 31714)
+
+	* unposted (cf. Carlo: 32202): MACHINES: OS X 10.9.1. gcc problem
 
 2013-12-28  Barton E. Schaefer  <schaefer@zsh.org>
 
diff --git a/Completion/Zsh/Command/_cd b/Completion/Zsh/Command/_cd
index b9860ffc8..6b8d7ebeb 100644
--- a/Completion/Zsh/Command/_cd
+++ b/Completion/Zsh/Command/_cd
@@ -63,7 +63,7 @@ else
     fi
   fi
 
-  if [[ $PREFIX != (\~|/|./|../)* ]]; then
+  if [[ $PREFIX != (\~|/|./|../)* && $IPREFIX != ../* ]]; then
     local tmpcdpath alt
 
     alt=()