From a569990ca2683c537acb88b4866962e57f9a054c Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 22 Apr 2022 14:50:50 +0200
Subject: [PATCH 1/3] fix tests

---
 tests/src/fsfw_tests/unit/version.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/src/fsfw_tests/unit/version.cpp b/tests/src/fsfw_tests/unit/version.cpp
index 2967dfa5..f9170a4d 100644
--- a/tests/src/fsfw_tests/unit/version.cpp
+++ b/tests/src/fsfw_tests/unit/version.cpp
@@ -10,12 +10,12 @@ TEST_CASE("Version API Tests", "[TestVersionAPI]") {
   // Check that major version is non-zero
   REQUIRE(fsfw::FSFW_VERSION.major > 0);
   uint32_t fsfwMajor = fsfw::FSFW_VERSION.major;
-  REQUIRE(fsfw::Version(255, 0, 0) > fsfw::FSFW_VERSION);
-  REQUIRE(fsfw::Version(255, 0, 0) >= fsfw::FSFW_VERSION);
-  REQUIRE(fsfw::Version(0, 0, 0) < fsfw::FSFW_VERSION);
-  REQUIRE(fsfw::Version(0, 0, 0) <= fsfw::FSFW_VERSION);
-  fsfw::Version v1 = fsfw::Version(1, 1, 1);
-  fsfw::Version v2 = fsfw::Version(1, 1, 1);
+  REQUIRE(Version(255, 0, 0) > fsfw::FSFW_VERSION);
+  REQUIRE(Version(255, 0, 0) >= fsfw::FSFW_VERSION);
+  REQUIRE(Version(0, 0, 0) < fsfw::FSFW_VERSION);
+  REQUIRE(Version(0, 0, 0) <= fsfw::FSFW_VERSION);
+  Version v1 = fsfw::Version(1, 1, 1);
+  Version v2 = fsfw::Version(1, 1, 1);
   REQUIRE(v1 == v2);
   REQUIRE(not(v1 < v2));
   REQUIRE(not(v1 > v2));

From 4079edc80e57bd29394b28b7d0119367960b3fff Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 22 Apr 2022 14:52:55 +0200
Subject: [PATCH 2/3] update changelog

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85f6ef28..975375f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - `oneShotAction` flag in the `TestTask` class is not static anymore
 - HAL Linux Uart: Baudrate and bits per word are enums now, avoiding misconfigurations
   PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/585
+- Major update for version handling, using `git describe` to fetch version information with git.
+  PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/601
+  - Place `Version` class outside of `fsfw` namespace. It is generic
+  - Add helper functions provided by [`cmake-modules`](https://github.com/bilke/cmake-modules) manually now. Those should not change too often and only a small subset is needed
+  - Separate folder for easier update and for distintion
+  - LICENSE file included
+  - use `int` for version numbers to allow unset or uninitialized version
+  - Initialize Version object with numbers set to -1
+  - Instead of hardcoding the git hash, it is now retrieved from git
+  - `Version` now allows specifying additional version information like the git SHA1 hash and the versions since the last tag
+  - Additional information is set to the last part of the git describe output for `FSFW_VERSION` now.
+  - Version still need to be hand-updated if the FSFW is not included as a submodule for now.
 
 ## Removed
 

From 539e01deee7df2c0f3cf220b77eb29b80ec92cb8 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 22 Apr 2022 14:53:12 +0200
Subject: [PATCH 3/3] minor form change

---
 CHANGELOG.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 975375f2..8badeea4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,13 +27,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Major update for version handling, using `git describe` to fetch version information with git.
   PR: https://egit.irs.uni-stuttgart.de/fsfw/fsfw/pulls/601
   - Place `Version` class outside of `fsfw` namespace. It is generic
-  - Add helper functions provided by [`cmake-modules`](https://github.com/bilke/cmake-modules) manually now. Those should not change too often and only a small subset is needed
+  - Add helper functions provided by [`cmake-modules`](https://github.com/bilke/cmake-modules)
+    manually now. Those should not change too often and only a small subset is needed
   - Separate folder for easier update and for distintion
   - LICENSE file included
   - use `int` for version numbers to allow unset or uninitialized version
   - Initialize Version object with numbers set to -1
   - Instead of hardcoding the git hash, it is now retrieved from git
-  - `Version` now allows specifying additional version information like the git SHA1 hash and the versions since the last tag
+  - `Version` now allows specifying additional version information like the git SHA1 hash and the
+    versions since the last tag
   - Additional information is set to the last part of the git describe output for `FSFW_VERSION` now.
   - Version still need to be hand-updated if the FSFW is not included as a submodule for now.