]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/quote-path-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Sep 2020 00:58:04 +0000 (17:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Sep 2020 00:58:04 +0000 (17:58 -0700)
"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()

1  2 
diff.c
t/t7508-status.sh
wt-status.c

diff --cc diff.c
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge