From 10ed4ec5ba09201601e7d451ce83156b721f9d90 Mon Sep 17 00:00:00 2001
From: rasmus-kirk <mail@rasmuskirk.com>
Date: Tue, 3 Sep 2024 16:25:38 +0200
Subject: [PATCH 1/2] fix: collision with argument `--out` for `./client
 validator add ...`

---
 .gitignore                        | 4 ++++
 src/Concordium/Client/Commands.hs | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 46e8e12f..59fe7e50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,7 @@ tmp/
 gtu-drop-account.json
 hie.yaml
 out/
+# Nix stuff
+flake.nix
+flake.lock
+shell.nix
diff --git a/src/Concordium/Client/Commands.hs b/src/Concordium/Client/Commands.hs
index f673c7bf..3248f4b5 100644
--- a/src/Concordium/Client/Commands.hs
+++ b/src/Concordium/Client/Commands.hs
@@ -1739,7 +1739,7 @@ bakerAddCmd =
                         <*> blockCommission
                         <*> (option (eitherReader amountFractionFromStringInform) (long "delegation-finalization-commission" <> metavar "DECIMAL-FRACTION" <> help ("Fraction the validator takes in commission from delegators on finalization rewards. " ++ rangesHelpString "finalization reward commission")))
                     )
-                <*> optional (strOption (long "out" <> metavar "FILE" <> help "File to write the validator credentials to, in case of successful transaction. These can be used to start the node."))
+                <*> optional (strOption (long "validator-credentials-out" <> metavar "FILE" <> help "File to write the validator credentials to, in case of successful transaction. These can be used to start the node."))
             )
             (progDesc "Deploy validator credentials to the chain.")
         )

From 3042da3f58ba25c6acd2124db28a8af00c3dcf12 Mon Sep 17 00:00:00 2001
From: rasmus-kirk <mail@rasmuskirk.com>
Date: Wed, 11 Sep 2024 10:32:11 +0200
Subject: [PATCH 2/2] Updated changelog

---
 ChangeLog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 2b1f9370..61f898d2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+- Change `--out` flag for `./client validator add` to
+  `--validator-credentials-out`, fixing an issue where this command had two
+  conflicting`--out` options.
+
 ## 7.0.0
 
 - Support node version 7 and protocol version 7.