]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/precompose-prefix-too'
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Feb 2021 22:21:04 +0000 (14:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Feb 2021 22:21:04 +0000 (14:21 -0800)
When commands are started from a subdirectory, they may have to
compare the path to the subdirectory (called prefix and found out
from $(pwd)) with the tracked paths.  On macOS, $(pwd) and
readdir() yield decomposed path, while the tracked paths are
usually normalized to the precomposed form, causing mismatch.  This
has been fixed by taking the same approach used to normalize the
command line arguments.

* tb/precompose-prefix-too:
  MacOS: precompose_argv_prefix()

1  2 
builtin/diff-files.c
builtin/diff.c
builtin/submodule--helper.c
git-compat-util.h
git.c
t/t3910-mac-os-precompose.sh

Simple merge
diff --cc builtin/diff.c
Simple merge
Simple merge
Simple merge
diff --cc git.c
Simple merge
Simple merge