From e832c32ca821b04c8bfca80c5c07adca470ef000 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Thu, 20 Apr 2017 12:53:33 -0400
Subject: kwsys: remove extra attribute

This is set in `Source/.gitattributes` already and does not need to be
set inside of the import.
---
 Source/kwsys/.gitattributes | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Source/kwsys/.gitattributes b/Source/kwsys/.gitattributes
index 3583f39..9e9c535 100644
--- a/Source/kwsys/.gitattributes
+++ b/Source/kwsys/.gitattributes
@@ -11,5 +11,3 @@
 *.cmake          whitespace=tab-in-indent
 *.rst            whitespace=tab-in-indent conflict-marker-size=79
 *.txt            whitespace=tab-in-indent
-
-* -format.clang-format
-- 
cgit v0.12


From a139b81a52d6bfb33ea660dff2f89fdb8a2e8ace Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Thu, 20 Apr 2017 12:53:59 -0400
Subject: update-kwsys: apply changes made in CMake to the import

---
 Utilities/Scripts/update-kwsys.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Utilities/Scripts/update-kwsys.bash b/Utilities/Scripts/update-kwsys.bash
index d5485aa..dfbd366 100755
--- a/Utilities/Scripts/update-kwsys.bash
+++ b/Utilities/Scripts/update-kwsys.bash
@@ -15,7 +15,8 @@ readonly paths="
 
 extract_source () {
     git_archive
-    disable_custom_gitattributes
+    sed -i -e '/import off/,/import on/d' "$extractdir/$name-reduced/.gitattributes"
+    sed -i -e 's/project=KWSys/project=PublicDashboard/' "$extractdir/$name-reduced/CTestConfig.cmake"
 }
 
 export HOOKS_ALLOW_KWSYS=1
-- 
cgit v0.12


From d88a511da345d25cbb905add9ceb258ecc9cf2ba Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Thu, 20 Apr 2017 15:35:39 -0400
Subject: kwsys: match upstream changes

This allows the import to merge cleanly.
---
 Source/kwsys/.gitattributes | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/kwsys/.gitattributes b/Source/kwsys/.gitattributes
index 9e9c535..7065eb5 100644
--- a/Source/kwsys/.gitattributes
+++ b/Source/kwsys/.gitattributes
@@ -1,12 +1,12 @@
 .git*            export-ignore
 
-*.c              our-c-style
-*.c.in           our-c-style
-*.cxx            our-c-style
-*.h              our-c-style
-*.h.in           our-c-style
-*.hxx            our-c-style
-*.hxx.in         our-c-style
+*.c              kwsys-c-style
+*.c.in           kwsys-c-style
+*.cxx            kwsys-c-style
+*.h              kwsys-c-style
+*.h.in           kwsys-c-style
+*.hxx            kwsys-c-style
+*.hxx.in         kwsys-c-style
 
 *.cmake          whitespace=tab-in-indent
 *.rst            whitespace=tab-in-indent conflict-marker-size=79
-- 
cgit v0.12


From 22729eae17d316e709de555d2692c9c8c33918bd Mon Sep 17 00:00:00 2001
From: KWSys Upstream <kwrobot@kitware.com>
Date: Thu, 20 Apr 2017 15:04:04 -0400
Subject: KWSys 2017-04-20 (8785f84f)

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 8785f84f4760da060cdb2499155bb39532f8c053 (master).

Upstream Shortlog
-----------------

Ben Boeckel (2):
      ac0c67d2 gitattributes: indicate attributes to ignore when importing
      3dfeb55e gitattributes: rename the c-style attribute
---
 .gitattributes    | 24 +++++++-----------------
 CTestConfig.cmake |  2 +-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 8ce3d68..7065eb5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,22 +1,12 @@
 .git*            export-ignore
-.gitattributes  -export-ignore
-.hooks*          export-ignore
 
-# Custom attribute to mark sources as using our C code style.
-#[attr]our-c-style  whitespace=tab-in-indent  format.clang-format
-
-/GitSetup        export-ignore
-/*.sh            export-ignore eol=lf
-/*.bash          export-ignore eol=lf
-/.clang-format   export-ignore
-
-*.c              our-c-style
-*.c.in           our-c-style
-*.cxx            our-c-style
-*.h              our-c-style
-*.h.in           our-c-style
-*.hxx            our-c-style
-*.hxx.in         our-c-style
+*.c              kwsys-c-style
+*.c.in           kwsys-c-style
+*.cxx            kwsys-c-style
+*.h              kwsys-c-style
+*.h.in           kwsys-c-style
+*.hxx            kwsys-c-style
+*.hxx.in         kwsys-c-style
 
 *.cmake          whitespace=tab-in-indent
 *.rst            whitespace=tab-in-indent conflict-marker-size=79
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 1339ffc..33ea84c 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -5,5 +5,5 @@ set(CTEST_PROJECT_NAME "KWSys")
 set(CTEST_NIGHTLY_START_TIME "21:00:00 EDT")
 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "open.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=KWSys")
+set(CTEST_DROP_LOCATION "/submit.php?project=PublicDashboard")
 set(CTEST_DROP_SITE_CDASH TRUE)
-- 
cgit v0.12