261028.1.2 · 014b1523953b0067a8c414d97aac13f3744c2dd7
Merge upstream/master; drop changelog note for zsh --format
Keep --format and the hidden --literal alias in the zsh completion, alongside upstream --exact. Omit the changelog line per review.
reading declarations
Changes to contrib/completion/. All files
@@ -22,7 +22,7 @@ _fd() { fd_types=( {f,file}'\:"regular files"'- {d,directory}'\:"directories"'+ {d,dir,directory}'\:"directories"' {l,symlink}'\:"symbolic links"' {e,empty}'\:"empty files or directories"' {x,executable}'\:"executable (files)"'@@ -54,12 +54,12 @@ _fd() { + '(no-ignore-full)' # all ignore files '(no-ignore-partial)'{-I,--no-ignore}"[don't respect .(git|fd)ignore and global ignore files]"- $no'(no-ignore-partial)*'{-u,--unrestricted}'[alias for --no-ignore, when repeated also alias for --hidden]'+ $no'(no-ignore-partial)*'{-u,--unrestricted}'[alias for --no-ignore --hidden]' + no-ignore-partial # some ignore files "(no-ignore-full --no-ignore-vcs)--no-ignore-vcs[don't respect .gitignore files]" "!(no-ignore-full --no-global-ignore-file)--no-global-ignore-file[don't respect the global ignore file]"- $no'(no-ignore-full --no-ignore-parent)--no-ignore-parent[]'+ "$no(no-ignore-full --no-ignore-parent)--no-ignore-parent[don't respect .(git|fd)ignore files in parent directories]" + '(case)' # case-sensitivity {-s,--case-sensitive}'[perform a case-sensitive search]'@@ -72,6 +72,7 @@ _fd() { {-g,--glob}'[perform a glob-based search]' {-F,--fixed-strings}'[treat pattern as literal string instead of a regex]' '!--literal'+ '--exact[pattern must exactly match the full filename]' + '(no-require-git)' "$no(no-ignore-full --no-ignore-vcs --no-require-git)--no-require-git[don't require git repo to respect gitignores]"@@ -81,6 +82,7 @@ _fd() { + '(follow)' # follow symlinks {-L,--follow}'[follow symbolic links to directories]'+ '!--dereference' + '(abs-path)' # show absolute paths '(long-listing)'{-a,--absolute-path}'[show absolute paths instead of relative paths]'@@ -95,9 +97,13 @@ _fd() { '(long-listing)'--format=[print results according to template]:format + '(max-results)' # max number of results- '(long-listing exec-cmds)--max-results=[limit number of search results to given count and quit]:count'+ '(long-listing exec-cmds quiet)--max-results=[limit number of search results to given count and quit]:count' '(long-listing exec-cmds)-1[limit to a single search result and quit]' + + '(quiet)'+ '(max-results)'{-q,--quiet}'[print nothing. exit code 1 if no matches]'+ '!(max-results)--has-results'+ + '(fs-errors)' # file-system errors $no'--show-errors[enable the display of filesystem errors]' @@ -108,8 +114,9 @@ _fd() { + dir-depth # directory depth '(--exact-depth -d --max-depth)'{-d+,--max-depth=}'[set max directory depth to descend when searching]:depth'- '!(--exact-depth -d --max-depth)--maxdepth:depth'+ '!(--exact-depth -d --max-depth)--maxdepth=:depth' '(--exact-depth --min-depth)--min-depth=[set directory depth to descend before start searching]:depth'+ '!(--exact-depth --min-depth)--mindepth=:depth' '(--exact-depth -d --max-depth --maxdepth --min-depth)--exact-depth=[only search at the exact given directory depth]:depth' + prune # pruning@@ -144,6 +151,7 @@ _fd() { ))' '--hyperlink=-[add hyperlinks to output paths]::when:(auto never always)'+ '!--hyper=-' + '(threads)' {-j+,--threads=}'[set the number of threads for searching and executing]:number of threads'@@ -156,6 +164,8 @@ _fd() { + other '!(--max-buffer-time)--max-buffer-time=[set amount of time to buffer before showing output]:time (ms)' + '*--ignore-contain=[Ignore dirs containing named file]:name'+ + '(about)' # about flags '(: * -)'{-h,--help}'[display help message]' '(: * -)'{-V,--version}'[display version information]'@@ -171,7 +181,7 @@ _fd() { $no'(strip-cwd-prefix exec-cmds)--strip-cwd-prefix=-[When to strip ./]::when:(always never auto)' + and- '--and=[additional required search path]:pattern'+ '*--and=[additional required search pattern]:pattern' + args # positional arguments@@ -221,7 +231,7 @@ _fd() { 'T:terabytes (10^12 = 1000^4 bytes)' 'Ki:kibibytes ( 2^10 = 1024 bytes)' 'Mi:mebibytes ( 2^20 = 1024^2 bytes)'- 'Gi:gigibytes ( 2^30 = 1024^3 bytes)'+ 'Gi:gibibytes ( 2^30 = 1024^3 bytes)' 'Ti:tebibytes ( 2^40 = 1024^4 bytes)' ) _describe -t units 'size limit units' suff -V 'units'