about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2015-02-08 06:44:02 +0100
committerMikael Magnusson <mikachu@gmail.com>2015-02-09 05:13:34 +0100
commitdfbb5e4853d8cc55fb7c3ffe53887130cbc2dc3f (patch)
tree217fc7f3669467aad025e37f78ea054be1e2aa67
parent7d15b9a9cb22972b5864523de5689aa05a8d61da (diff)
downloadzsh-dfbb5e4853d8cc55fb7c3ffe53887130cbc2dc3f.tar.gz
zsh-dfbb5e4853d8cc55fb7c3ffe53887130cbc2dc3f.tar.xz
zsh-dfbb5e4853d8cc55fb7c3ffe53887130cbc2dc3f.zip
34466: Fix double unmeta in rm verification
-rw-r--r--ChangeLog4
-rw-r--r--Src/utils.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fdb02a943..1af298bf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-09  Mikael Magnusson  <mikachu@gmail.com>
+
+	* 34466: Src/utils.c: Fix double unmeta in rm verification
+
 2015-02-08  Daniel Hahler  <git@thequod.de>
 
 	* 34469: Completion/Unix/Command/_git: git completion: add "stash"
diff --git a/Src/utils.c b/Src/utils.c
index 47d99442d..702829c0c 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2460,7 +2460,7 @@ checkrmall(char *s)
 	return 1;
     fprintf(shout, "zsh: sure you want to delete all the files in ");
     if (*s != '/') {
-	nicezputs(pwd[1] ? unmeta(pwd) : "", shout);
+	nicezputs(pwd[1] ? pwd : "", shout);
 	fputc('/', shout);
     }
     nicezputs(s, shout);