From b555457d398c854821f9a0d73553c08db76ede5b Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 20 Feb 2019 12:06:48 +0100 Subject: [PATCH 1/5] update .gitignore to include Visual Studio artifacts --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index f40064d5b..104e72099 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,10 @@ massif-* # CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those: *.dir/ + +# Visual Studio artifacts +/visualc/VS2010/.localhistory/ +/visualc/VS2010/.vs/ +/visualc/VS2010/Debug/ +/visualc/VS2010/Release/ +/visualc/VS2010/*.vcxproj.user From 97866573654bb5d920c5acc67420df4b5b6cd92c Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 20 Feb 2019 13:52:02 +0100 Subject: [PATCH 2/5] add Visual Studio filters to .gitignore --- .gitignore | 71 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 104e72099..bc4522fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,35 +1,36 @@ -CMakeCache.txt -CMakeFiles -CTestTestfile.cmake -cmake_install.cmake -Testing -Coverage -*.gcno -*.gcda - -# generated by scripts/memory.sh -massif-* - -# MSVC files generated by CMake: -/*.sln -/*.vcxproj -/*.filters - -# MSVC build artifacts: -*.exe -*.pdb -*.ilk -*.lib - -# Python build artifacts: -*.pyc - -# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those: -*.dir/ - -# Visual Studio artifacts -/visualc/VS2010/.localhistory/ -/visualc/VS2010/.vs/ -/visualc/VS2010/Debug/ -/visualc/VS2010/Release/ -/visualc/VS2010/*.vcxproj.user +CMakeCache.txt +CMakeFiles +CTestTestfile.cmake +cmake_install.cmake +Testing +Coverage +*.gcno +*.gcda + +# generated by scripts/memory.sh +massif-* + +# MSVC files generated by CMake: +/*.sln +/*.vcxproj +/*.filters + +# MSVC build artifacts: +*.exe +*.pdb +*.ilk +*.lib + +# Python build artifacts: +*.pyc + +# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those: +*.dir/ + +# Visual Studio artifacts +/visualc/VS2010/.localhistory/ +/visualc/VS2010/.vs/ +/visualc/VS2010/Debug/ +/visualc/VS2010/Release/ +/visualc/VS2010/*.vcxproj.filters +/visualc/VS2010/*.vcxproj.user From a6ead983b379a8da03b65c6bcc8c4850469aa3e6 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 20 Feb 2019 14:20:05 +0100 Subject: [PATCH 3/5] mention .gitignore changes in ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 9ab0c03c6..34c738e5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,6 +38,7 @@ Changes Found by Coverity, reported and fixed by Peter Kolbus (Garmin). Fixes #2309. * Add test for minimal value of MBEDTLS_MPI_WINDOW_SIZE to all.sh. Contributed by Peter Kolbus (Garmin). + * Extended .gitignore to ignore Visual Studio artifacts (ConfusedSushi) = mbed TLS 2.17.0 branch released 2019-03-19 From 8e6740f15d7b96643637cc3956be44ab1fb695bc Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Wed, 20 Feb 2019 15:51:32 +0100 Subject: [PATCH 4/5] Update ChangeLog Co-Authored-By: confusedsushi --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 34c738e5b..1b76a4e5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -38,7 +38,7 @@ Changes Found by Coverity, reported and fixed by Peter Kolbus (Garmin). Fixes #2309. * Add test for minimal value of MBEDTLS_MPI_WINDOW_SIZE to all.sh. Contributed by Peter Kolbus (Garmin). - * Extended .gitignore to ignore Visual Studio artifacts (ConfusedSushi) + * Extended .gitignore to ignore Visual Studio artifacts. Fixed by ConfusedSushi. = mbed TLS 2.17.0 branch released 2019-03-19 From c709a00b7bae27c0ab6da504265c79de01df9ddb Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 28 Feb 2019 17:57:07 +0100 Subject: [PATCH 5/5] change .gitignore line endings to UNIX --- .gitignore | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index bc4522fbe..35d1d2ad3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,36 +1,36 @@ -CMakeCache.txt -CMakeFiles -CTestTestfile.cmake -cmake_install.cmake -Testing -Coverage -*.gcno -*.gcda - -# generated by scripts/memory.sh -massif-* - -# MSVC files generated by CMake: -/*.sln -/*.vcxproj -/*.filters - -# MSVC build artifacts: -*.exe -*.pdb -*.ilk -*.lib - -# Python build artifacts: -*.pyc - -# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those: -*.dir/ - -# Visual Studio artifacts -/visualc/VS2010/.localhistory/ -/visualc/VS2010/.vs/ -/visualc/VS2010/Debug/ -/visualc/VS2010/Release/ -/visualc/VS2010/*.vcxproj.filters -/visualc/VS2010/*.vcxproj.user +CMakeCache.txt +CMakeFiles +CTestTestfile.cmake +cmake_install.cmake +Testing +Coverage +*.gcno +*.gcda + +# generated by scripts/memory.sh +massif-* + +# MSVC files generated by CMake: +/*.sln +/*.vcxproj +/*.filters + +# MSVC build artifacts: +*.exe +*.pdb +*.ilk +*.lib + +# Python build artifacts: +*.pyc + +# CMake generates *.dir/ folders for in-tree builds (used by MSVC projects), ignore all of those: +*.dir/ + +# Visual Studio artifacts +/visualc/VS2010/.localhistory/ +/visualc/VS2010/.vs/ +/visualc/VS2010/Debug/ +/visualc/VS2010/Release/ +/visualc/VS2010/*.vcxproj.filters +/visualc/VS2010/*.vcxproj.user