зеркало из https://github.com/microsoft/git.git
Merge branch 'jk/no-textconv-symlink' into maint
* jk/no-textconv-symlink: diff: don't use pathname-based diff drivers for symlinks
This commit is contained in:
Коммит
78bce6c7e9
11
diff.c
11
diff.c
|
@ -1771,8 +1771,14 @@ static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two, char *pre
|
|||
|
||||
static void diff_filespec_load_driver(struct diff_filespec *one)
|
||||
{
|
||||
if (!one->driver)
|
||||
/* Use already-loaded driver */
|
||||
if (one->driver)
|
||||
return;
|
||||
|
||||
if (S_ISREG(one->mode))
|
||||
one->driver = userdiff_find_by_path(one->path);
|
||||
|
||||
/* Fallback to default settings */
|
||||
if (!one->driver)
|
||||
one->driver = userdiff_find_by_name("default");
|
||||
}
|
||||
|
@ -1820,8 +1826,7 @@ struct userdiff_driver *get_textconv(struct diff_filespec *one)
|
|||
{
|
||||
if (!DIFF_FILE_VALID(one))
|
||||
return NULL;
|
||||
if (!S_ISREG(one->mode))
|
||||
return NULL;
|
||||
|
||||
diff_filespec_load_driver(one);
|
||||
if (!one->driver->textconv)
|
||||
return NULL;
|
||||
|
|
|
@ -88,4 +88,30 @@ test_expect_success SYMLINKS \
|
|||
test_must_fail git diff --no-index pinky brain > output 2> output.err &&
|
||||
grep narf output &&
|
||||
! grep error output.err'
|
||||
|
||||
test_expect_success SYMLINKS 'setup symlinks with attributes' '
|
||||
echo "*.bin diff=bin" >>.gitattributes &&
|
||||
echo content >file.bin &&
|
||||
ln -s file.bin link.bin &&
|
||||
git add -N file.bin link.bin
|
||||
'
|
||||
|
||||
cat >expect <<'EOF'
|
||||
diff --git a/file.bin b/file.bin
|
||||
index e69de29..d95f3ad 100644
|
||||
Binary files a/file.bin and b/file.bin differ
|
||||
diff --git a/link.bin b/link.bin
|
||||
index e69de29..dce41ec 120000
|
||||
--- a/link.bin
|
||||
+++ b/link.bin
|
||||
@@ -0,0 +1 @@
|
||||
+file.bin
|
||||
\ No newline at end of file
|
||||
EOF
|
||||
test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' '
|
||||
git config diff.bin.binary true &&
|
||||
git diff file.bin link.bin >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Загрузка…
Ссылка в новой задаче