diff: don't attempt to strip prefix from absolute Windows paths

git diff can be invoked with absolute paths. Typically, this triggers
the --no-index case. Then the absolute paths remain in the file names
that are printed in the output.

There is one peculiarity, though: When the command is invoked from a
a sub-directory in a repository, then it is attempted to strip the
sub-directory from the beginning of relative paths. Yet, to detect a
relative path the code just checks for an initial forward slash.
This mistakes a Windows style path like "D:/base" as a relative path
and the output looks like this, for example:

D:\dir\test\one>git -P diff --numstat D:\dir\base D:\dir\diff
1       1       ir/{base => diff}/1.txt

where the correct output should be

D:\dir\test\one>git -P diff --numstat D:\dir\base D:\dir\diff
1       1       D:/dir/{base => diff}/1.txt

If the sub-directory where 'git diff' is invoked is sufficiently deep
that the prefix becomes longer than the path to be printed, then the
subsequent code accesses the path out of bounds.

Use is_absolute_path() to detect Windows style absolute paths.

One might wonder whether the check for a directory separator that
is visible in the patch context should be changed from == '/' to
is_dir_sep() or not. It turns out not to be necessary. That code
only ever investigates paths that have undergone pathspec
normalization, after which there are only forward slashes even on
Windows.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff.c b/diff.c
index e9d0e38123a59f2ca54674115df4140836b98f18..5a111b50ef26a132c0ad1b95ca1e9b830c4e2183 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -3958,12 +3958,12 @@ static void diff_fill_oid_info(struct diff_filespec *one)
 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
 {
        /* Strip the prefix but do not molest /dev/null and absolute paths */
 static void strip_prefix(int prefix_length, const char **namep, const char **otherp)
 {
        /* Strip the prefix but do not molest /dev/null and absolute paths */

-       if (*namep && **namep != '/') {
+       if (*namep && !is_absolute_path(*namep)) {

                *namep += prefix_length;
                if (**namep == '/')
                        ++*namep;
        }
                *namep += prefix_length;
                if (**namep == '/')
                        ++*namep;
        }

-       if (*otherp && **otherp != '/') {
+       if (*otherp && !is_absolute_path(*otherp)) {

                *otherp += prefix_length;
                if (**otherp == '/')
                        ++*otherp;
                *otherp += prefix_length;
                if (**otherp == '/')
                        ++*otherp;

diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
index 453e6c35eb89fd82649401cb20a462c560a102cf..6e0dd6f9e5c482631147bb4770498dc4e7a8165f 100755 (executable)
--- a/t/t4053-diff-no-index.sh
+++ b/t/t4053-diff-no-index.sh
@@ -127,4 +127,14 @@ test_expect_success 'diff --no-index from repo subdir respects config (implicit)
        test_cmp expect actual.head
 '
 
        test_cmp expect actual.head
 '
 

+test_expect_success 'diff --no-index from repo subdir with absolute paths' '
+       cat <<-EOF >expect &&
+       1       1       $(pwd)/non/git/{a => b}
+       EOF
+       test_expect_code 1 \
+               git -C repo/sub diff --numstat \
+               "$(pwd)/non/git/a" "$(pwd)/non/git/b" >actual &&
+       test_cmp expect actual
+'
+

 test_done
 test_done