This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 96f661517d1e98a7a940f16781e6713745074e2a (commit)
via 97149ff8db660c4cb49b5061157f3d0b34adcacb (commit)
via a35f4be61ff49e39152d63e4a8b56ee820d4c5fe (commit)
via afac3d107d7a12e6a6e425a446787d817fd2fe25 (commit)
from d13971ab60120570bac9c30ac6ce93d3a76be4db (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96f661517d1e98a7a940f16781e6713745074e2a
commit 96f661517d1e98a7a940f16781e6713745074e2a
Merge: d13971a 97149ff
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Mar 9 13:59:17 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Mar 9 13:59:17 2016 -0500
Merge topic 'update-third-party' into next
97149ff8 update-third-party: read attributes from the worktree
a35f4be6 update-third-party: Add license notice
afac3d10 update-third-party: remove empty directories as well
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97149ff8db660c4cb49b5061157f3d0b34adcacb
commit 97149ff8db660c4cb49b5061157f3d0b34adcacb
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Mon Feb 8 13:37:01 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 9 13:57:57 2016 -0500
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.
diff --git a/Utilities/Scripts/update-third-party.bash
b/Utilities/Scripts/update-third-party.bash
index d973671..6aeeccd 100644
--- a/Utilities/Scripts/update-third-party.bash
+++ b/Utilities/Scripts/update-third-party.bash
@@ -48,7 +48,7 @@
# Utility functions
########################################################################
git_archive () {
- git archive --prefix="$name-reduced/" HEAD -- $paths | \
+ git archive --worktree-attributes --prefix="$name-reduced/" HEAD -- $paths
| \
tar -C "$extractdir" -x
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a35f4be61ff49e39152d63e4a8b56ee820d4c5fe
commit a35f4be61ff49e39152d63e4a8b56ee820d4c5fe
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Feb 5 13:37:45 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 9 13:57:41 2016 -0500
update-third-party: Add license notice
Our Git infrastructure scripts use the "Apache License 2.0".
diff --git a/Utilities/Scripts/update-third-party.bash
b/Utilities/Scripts/update-third-party.bash
index d4d346c..d973671 100644
--- a/Utilities/Scripts/update-third-party.bash
+++ b/Utilities/Scripts/update-third-party.bash
@@ -1,3 +1,19 @@
+#=============================================================================
+# Copyright 2015-2016 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
########################################################################
# Script for updating third party packages.
#
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afac3d107d7a12e6a6e425a446787d817fd2fe25
commit afac3d107d7a12e6a6e425a446787d817fd2fe25
Author: Ben Boeckel <ben.boec...@kitware.com>
AuthorDate: Tue Feb 2 14:23:24 2016 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Mar 9 13:57:27 2016 -0500
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.
diff --git a/Utilities/Scripts/update-third-party.bash
b/Utilities/Scripts/update-third-party.bash
index 8925296..d4d346c 100644
--- a/Utilities/Scripts/update-third-party.bash
+++ b/Utilities/Scripts/update-third-party.bash
@@ -85,6 +85,7 @@ if [ -n "$basehash" ]; then
# Clear out the working tree
pushd "$extractdir"
git ls-files | xargs rm -v
+ find . -type d -empty -delete
popd
else
# Create a repo to hold this package's history
-----------------------------------------------------------------------
Summary of changes:
Utilities/Scripts/update-third-party.bash | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
