From 99fd8c0fe97b6e481ea41c16c753f3033aa1b47a Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Tue, 7 Aug 2018 16:45:31 +0200 Subject: unposted (PR #26): __git_files: fix double quotation of star This fixes the double quote introduced by aa160fc8, so that the end result of the parameter expansion is $pref followed by \* (a quoted star), meaning `git ls-files` gets a literal star, not an expanded list of matching files, as was intended in commit cc7437bf. Fixes completion of `git add ../`. --- ChangeLog | 5 +++++ Completion/Unix/Command/_git | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5b3ace6a9..110f8636d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-08-12 Marc Cornellà + + * unposted (PR #26): Completion/Unix/Command/_git: __git_files: + fix double quotation of star + 2018-08-09 Peter Stephenson * 43264: Src/params.c, Test/D04parameter.ztst: diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 38b872ea0..eac0c8476 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -6812,7 +6812,7 @@ __git_files () { local pref=$gitcdup$gitprefix$PREFIX # First allow ls-files to pattern-match in case of remote repository - files=(${(0)"$(_call_program files git ls-files -z --exclude-standard ${(q)opts} -- ${(q)${pref:+$pref\\\*}:-.} 2>/dev/null)"}) + files=(${(0)"$(_call_program files git ls-files -z --exclude-standard ${(q)opts} -- ${(q)${pref:+$pref\*}:-.} 2>/dev/null)"}) __git_command_successful $pipestatus || return # If ls-files succeeded but returned nothing, try again with no pattern -- cgit 1.4.1