undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/diff-notice-has-drive-prefix' into maint

Browse Source 
Under certain circumstances, "git diff D:/a/b/c D:/a/b/d" on
Windows would strip initial parts from the paths because they
were not recognized as absolute, which has been corrected.

* js/diff-notice-has-drive-prefix:
  diff: don't attempt to strip prefix from absolute Windows paths
This commit is contained in:
Junio C Hamano 2018-11-21 22:57:50 +09:00
commit 45dda3a2dc
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff.c
View File

@ -4256,12 +4256,12 @@ static void diff_fill_oid_info(struct diff_filespec *one)
static void strip_prefix(int prefix_length, const char **namep, const char **otherp) 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 */ /* Strip the prefix but do not molest /dev/null and absolute paths */
if (*namep && **namep != '/') { if (*namep && !is_absolute_path(*namep)) {
*namep += prefix_length; *namep += prefix_length;
if (**namep == '/') if (**namep == '/')
++*namep; ++*namep;
} }
if (*otherp && **otherp != '/') { if (*otherp && !is_absolute_path(*otherp)) {
*otherp += prefix_length; *otherp += prefix_length;
if (**otherp == '/') if (**otherp == '/')
++*otherp; ++*otherp;

10
t/t4053-diff-no-index.sh
View File

@ -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