diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-27 13:01:59 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-27 13:02:02 (GMT) |
| commit | 0ff8f127fbbc6bd1fac84bd6f5118ad1efd0e786 (patch) | |
| tree | 5c0a8f39eb0621976636d9f660a1d48bb6c5a9cf /Utilities/Scripts | |
| parent | bb27f72d676f0e24c97891a9fd4c0ade9b2140f9 (diff) | |
| parent | ea2a91a43279616a602b641d827e07912ac9c0b9 (diff) | |
| download | CMake-0ff8f127fbbc6bd1fac84bd6f5118ad1efd0e786.zip CMake-0ff8f127fbbc6bd1fac84bd6f5118ad1efd0e786.tar.gz CMake-0ff8f127fbbc6bd1fac84bd6f5118ad1efd0e786.tar.bz2 | |
Merge topic 'update-kwsys'
ea2a91a4 Merge branch 'upstream-KWSys' into update-kwsys
fda80fde KWSys 2017-03-24 (7e9f7b7b)
64490637 update-kwsys: Disable custom gitattributes during import
f1a55839 update-third-party: Add helper to disable custom gitattributes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !624
Diffstat (limited to 'Utilities/Scripts')
| -rwxr-xr-x | Utilities/Scripts/update-kwsys.bash | 1 | ||||
| -rw-r--r-- | Utilities/Scripts/update-third-party.bash | 8 |
2 files changed, 9 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 diff --git a/Utilities/Scripts/update-third-party.bash b/Utilities/Scripts/update-third-party.bash index 3b8358e..670946e 100644 --- a/Utilities/Scripts/update-third-party.bash +++ b/Utilities/Scripts/update-third-party.bash @@ -52,6 +52,14 @@ git_archive () { tar -C "$extractdir" -x } +disable_custom_gitattributes() { + pushd "${extractdir}/${name}-reduced" + # Git does not allow custom attributes in a subdirectory where we + # are about to merge the `.gitattributes` file, so disable them. + sed -i '/^\[attr\]/ {s/^/#/}' .gitattributes + popd +} + die () { echo >&2 "$@" exit 1 |