From 64490637840b05da7f0829aa52cae7f3923b805e Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 24 Mar 2017 14:51:46 -0400 Subject: update-kwsys: Disable custom gitattributes during import The KWSys `.gitattributes` file now defines custom attributes. Git does not support these in a subdirectory where we are about to place the content, so comment them out during import. This also ensures that the `our-c-style` attribute on KWSys sources does not activate the `format.clang-format` attribute on the third-party import branch. --- Utilities/Scripts/update-kwsys.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/Utilities/Scripts/update-kwsys.bash b/Utilities/Scripts/update-kwsys.bash index 83da8a4..d5485aa 100755 --- a/Utilities/Scripts/update-kwsys.bash +++ b/Utilities/Scripts/update-kwsys.bash @@ -15,6 +15,7 @@ readonly paths=" extract_source () { git_archive + disable_custom_gitattributes } export HOOKS_ALLOW_KWSYS=1 -- cgit v0.12