diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-18 17:58:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-18 17:58:04 -0700 |
| commit | 9d4e7ec4d9e695d95cc7474f59fba8cc38580e29 (patch) | |
| tree | 22db63f4315c0e6698d67c879c73520ef4074c39 /builtin/grep.c | |
| parent | Merge branch 'os/collect-changed-submodules-optim' (diff) | |
| parent | quote: turn 'nodq' parameter into a set of flags (diff) | |
| download | git-9d4e7ec4d9e695d95cc7474f59fba8cc38580e29.tar.gz git-9d4e7ec4d9e695d95cc7474f59fba8cc38580e29.zip | |
Merge branch 'jc/quote-path-cleanup'
"git status --short" quoted a path with SP in it when tracked, but
not those that are untracked, ignored or unmerged. They are all
shown quoted consistently.
* jc/quote-path-cleanup:
quote: turn 'nodq' parameter into a set of flags
quote: rename misnamed sq_lookup[] to cq_lookup[]
wt-status: consistently quote paths in "status --short" output
quote_path: code clarification
quote_path: optionally allow quoting a path with SP in it
quote_path: give flags parameter to quote_path()
quote_path: rename quote_path_relative() to quote_path()
Diffstat (limited to 'builtin/grep.c')
| -rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index f58979bc3f..c8037388c6 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -319,7 +319,7 @@ static void grep_source_name(struct grep_opt *opt, const char *filename, } if (opt->relative && opt->prefix_length) - quote_path_relative(filename + tree_name_len, opt->prefix, out); + quote_path(filename + tree_name_len, opt->prefix, out, 0); else quote_c_style(filename + tree_name_len, out, NULL, 0); |