Commit Graph

7 Commits

Author SHA1 Message Date
Brad King
775c8b21da update-third-party: update from upstream
Update to `update-common.sh` from commit 958a2cd1b9 in

    https://gitlab.kitware.com/utils/git-import-third-party
2019-03-21 12:37:25 -04:00
Brad King
f1a5583901 update-third-party: Add helper to disable custom gitattributes
Provide a helper function that import scripts can use when the
third-party project defines custom Git attributes in its top-level
`.gitattributes` file.  These must be commented out because Git
does not support custom attributes in a subdirectory where we
where the third-party project is about to be merged.
2017-03-24 15:13:55 -04:00
Ben Boeckel
dcb2e39fda update-third-party: support Git 2.9.0's new merge restrictions
Use the `--allow-unrelated-histories` flag to declare that we Know What
We're Doing™ (but only if necessary).
2016-08-24 14:16:13 -04:00
Ben Boeckel
97149ff8db update-third-party: read attributes from the worktree
This should be done so that any attributes for ignoring certain files
when exporting can be appended to the file during the extraction step,
but ignored in the actual import. Necessary for importing the gitsetup
repository.
2016-03-09 13:57:57 -05:00
Brad King
a35f4be61f update-third-party: Add license notice
Our Git infrastructure scripts use the "Apache License 2.0".
2016-03-09 13:57:41 -05:00
Ben Boeckel
afac3d107d update-third-party: remove empty directories as well
The `git ls-files | xargs rm` removes only files; directories which are
empty are left laying around. This later chokes the `mv` which puts the
"reduced" directory into place. Remove the empty directories as well.
2016-03-09 13:57:27 -05:00
Ben Boeckel
498c36850b Add a script to help update third-party sources
Use the VTK `ThirdParty/update-common.sh` script as of commit
2f24b7b0f60b67a2a28b9aef210f06f904e7a977.

Co-Author: Brad King <brad.king@kitware.com>
2015-12-17 14:44:53 -05:00