zsh: complete unquoted paths with spaces correctly

yous · gitster · commit 7a478b36aa1f · 2019-01-03T11:48:13.000-08:00
The following is the description of -Q flag of zsh compadd [1]: This flag instructs the completion code not to quote any metacharacters in the words when inserting them into the command line. Let's say there is a file named 'foo bar.txt' in repository, but it's not yet added to the repository. Then the following command triggers a completion: git add fo<Tab> git add 'fo<Tab> git add "fo<Tab> The completion results in bash: git add foo\ bar.txt git add 'foo bar.txt' git add "foo bar.txt" While them in zsh: git add foo bar.txt git add 'foo bar.txt' git add "foo bar.txt" The first one, where the pathname is not enclosed in quotes, should escape the space with a backslash, just like bash completion does. Otherwise, this leads git to think there are two files; foo, and bar.txt. The main cause of this behavior is __gitcomp_file_direct(). The both implementions of bash and zsh are called with an argument 'foo bar.txt', but only bash adds a backslash before a space on command line. [1]: http://zsh.sourceforge.net/Doc/Release/Completion-Widgets.html Signed-off-by: Chayoung You <yousbe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -2993,7 +2993,7 @@ if [[ -n ${ZSH_VERSION-} ]] &&
 
 		local IFS=$'\n'
 		compset -P '*[=:]'
-		compadd -Q -f -- ${=1} && _ret=0
+		compadd -f -- ${=1} && _ret=0
 	}
 
 	__gitcomp_file ()
@@ -3002,7 +3002,7 @@ if [[ -n ${ZSH_VERSION-} ]] &&
 
 		local IFS=$'\n'
 		compset -P '*[=:]'
-		compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+		compadd -p "${2-}" -f -- ${=1} && _ret=0
 	}
 
 	_git ()
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
@@ -99,7 +99,7 @@ __gitcomp_file_direct ()
 
 	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -f -- ${=1} && _ret=0
+	compadd -f -- ${=1} && _ret=0
 }
 
 __gitcomp_file ()
@@ -108,7 +108,7 @@ __gitcomp_file ()
 
 	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
+	compadd -p "${2-}" -f -- ${=1} && _ret=0
 }
 
 __git_zsh_bash_func ()

Original file line number	Diff line number	Diff line change
`@@ -2993,7 +2993,7 @@ if [[ -n ${ZSH_VERSION-} ]] &&`
`2993`	`2993`
`2994`	`2994`	`local IFS=$'\n'`
`2995`	`2995`	`compset -P '*[=:]'`
`2996`		`- compadd -Q -f -- ${=1} && _ret=0`
	`2996`	`+ compadd -f -- ${=1} && _ret=0`
`2997`	`2997`	`}`
`2998`	`2998`
`2999`	`2999`	`__gitcomp_file ()`
`@@ -3002,7 +3002,7 @@ if [[ -n ${ZSH_VERSION-} ]] &&`
`3002`	`3002`
`3003`	`3003`	`local IFS=$'\n'`
`3004`	`3004`	`compset -P '*[=:]'`
`3005`		`- compadd -Q -p "${2-}" -f -- ${=1} && _ret=0`
	`3005`	`+ compadd -p "${2-}" -f -- ${=1} && _ret=0`
`3006`	`3006`	`}`
`3007`	`3007`
`3008`	`3008`	`_git ()`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ __gitcomp_file_direct ()`
`99`	`99`
`100`	`100`	`local IFS=$'\n'`
`101`	`101`	`compset -P '*[=:]'`
`102`		`- compadd -Q -f -- ${=1} && _ret=0`
	`102`	`+ compadd -f -- ${=1} && _ret=0`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`__gitcomp_file ()`
`@@ -108,7 +108,7 @@ __gitcomp_file ()`
`108`	`108`
`109`	`109`	`local IFS=$'\n'`
`110`	`110`	`compset -P '*[=:]'`
`111`		`- compadd -Q -p "${2-}" -f -- ${=1} && _ret=0`
	`111`	`+ compadd -p "${2-}" -f -- ${=1} && _ret=0`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`__git_zsh_bash_func ()`