diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-11 10:32:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-11 10:32:16 -0700 |
| commit | f1eba9f055f59ea7a04b4bb45facc1c64abc2132 (patch) | |
| tree | 113c841f6b8f289d05adccd9f145474aaa5bbe47 | |
| parent | c75aa630b2f7c9a6cbdaa3333daa1b128b3b8a01 (diff) | |
| parent | 35ba83ccf6f83d1278b3bff56db75be9c59fee69 (diff) | |
| download | git-f1eba9f055f59ea7a04b4bb45facc1c64abc2132.tar.gz git-f1eba9f055f59ea7a04b4bb45facc1c64abc2132.tar.xz | |
Merge branch 'mp/complete-paths'
* mp/complete-paths:
git-completion.bash: zsh does not implement function redirection correctly
| -rw-r--r-- | contrib/completion/git-completion.bash | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b62bec027..93eba4675 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -299,9 +299,12 @@ __git_index_file_list_filter () # the second argument. __git_ls_files_helper () { - # NOTE: $2 is not quoted in order to support multiple options - cd "$1" && git ls-files --exclude-standard $2 -} 2>/dev/null + ( + test -n "${CDPATH+set}" && unset CDPATH + # 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 @@ -309,8 +312,11 @@ __git_ls_files_helper () # specified in the second argument. __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: # 1: Options to pass to ls-files (required). |