undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mp/complete-paths'

Browse Source 
* mp/complete-paths:
  git-completion.bash: zsh does not implement function redirection correctly
This commit is contained in:
Junio C Hamano 2013-03-11 10:32:16 -07:00
commit f1eba9f055
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/completion/git-completion.bash
View File

@ -299,9 +299,12 @@ __git_index_file_list_filter ()
# the second argument. # the second argument.
__git_ls_files_helper () __git_ls_files_helper ()
{ {
# NOTE: $2 is not quoted in order to support multiple options (
cd "$1" && git ls-files --exclude-standard $2 test -n "${CDPATH+set}" && unset CDPATH
} 2>/dev/null # NOTE: $2 is not quoted in order to support multiple options
cd "$1" && git ls-files --exclude-standard $2
) 2>/dev/null
}
# Execute git diff-index, returning paths relative to the directory # Execute git diff-index, returning paths relative to the directory
@ -309,8 +312,11 @@ __git_ls_files_helper ()
# specified in the second argument. # specified in the second argument.
__git_diff_index_helper () __git_diff_index_helper ()
{ {
cd "$1" && git diff-index --name-only --relative "$2" (
} 2>/dev/null test -n "${CDPATH+set}" && unset CDPATH
cd "$1" && git diff-index --name-only --relative "$2"
) 2>/dev/null
}
# __git_index_files accepts 1 or 2 arguments: # __git_index_files accepts 1 or 2 arguments:
# 1: Options to pass to ls-files (required). # 1: Options to pass to ls-files (required).