summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-24 18:51:46 (GMT)
committerBrad King <brad.king@kitware.com>2017-03-24 19:16:39 (GMT)
commit64490637840b05da7f0829aa52cae7f3923b805e (patch)
tree6f859e9861a24c897ee986d88376074cad5a2aee
parentf1a5583901e051ef4627bf8be08565c4b331e99a (diff)
downloadCMake-64490637840b05da7f0829aa52cae7f3923b805e.zip
CMake-64490637840b05da7f0829aa52cae7f3923b805e.tar.gz
CMake-64490637840b05da7f0829aa52cae7f3923b805e.tar.bz2
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.
-rwxr-xr-xUtilities/Scripts/update-kwsys.bash1
1 files changed, 1 insertions, 0 deletions
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