From 6aa02f1fd9ea5e24c82b8edb865898063a39a765 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Mon, 3 Dec 2018 11:32:26 -0800 Subject: [PATCH] .gitattributes: add symlink target types This is a first step toward removing the fix_symlinks() hack from tools/third_party.py. --- .gitattributes | 6 ++++++ third_party | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 3c53eb39d6..cd4c83ed0f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,8 @@ # Use Unix line endings in all text files. * text=auto eol=lf + +# Tell git which symlinks point to files, and which ones point to directories. +# This is revelevant for Windows only, and requires git >= 2.19.2 to work. +/* symlink=dir +/website/* symlink=dir +/tools/clang symlink=dir diff --git a/third_party b/third_party index e94296a27c..7f6923ab6e 160000 --- a/third_party +++ b/third_party @@ -1 +1 @@ -Subproject commit e94296a27cdaeb96bfd86e499162764409e503bc +Subproject commit 7f6923ab6e7125238a69d4c0dd8b31f12cb78ce7