From: David Aguilar Date: Wed, 7 Dec 2016 10:16:08 +0000 (-0800) Subject: difftool: fix dir-diff index creation when in a subdirectory X-Git-Tag: v2.11.1~39^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/86defcbe3f6c54a31dc898cb3adb4a3b25f1eb1a?ds=inline;hp=86defcbe3f6c54a31dc898cb3adb4a3b25f1eb1a difftool: fix dir-diff index creation when in a subdirectory 9ec26e7977 (difftool: fix argument handling in subdirs, 2016-07-18) corrected how path arguments are handled in a subdirectory, but it introduced a regression in how entries outside of the subdirectory are handled by dir-diff. When preparing the right-side of the diff we only include the changed paths in the temporary area. The left side of the diff is constructed from a temporary index that is built from the same set of changed files, but it was being constructed from within the subdirectory. This is a problem because the indexed paths are toplevel-relative, and thus they were not getting added to the index. Teach difftool to chdir to the toplevel of the repository before preparing its temporary indexes. This ensures that all of the toplevel-relative paths are valid. Add test cases to more thoroughly exercise this scenario. Reported-by: Frank Becker Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano ---