[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

src/subcommand/add_subcommand.cpp

@@ -11,7 +11,11 @@ add_subcommand::add_subcommand(const libgit2_object&, CLI::App& app)
 
     sub->add_option("<files>", m_add_files, "Files to add content from.");
 
-    sub->add_flag("-A,--all,--no-ignore-removal", m_all_flag, "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree.\n\nIf no <pathspec> is given when -A option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories).");
+    sub->add_flag(
+        "-A,--all,--no-ignore-removal",
+        m_all_flag,
+        "Update the index not only where the working tree has a file matching <pathspec> but also where the index already has an entry. This adds, modifies, and removes index entries to match the working tree.\n\nIf no <pathspec> is given when -A option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
+    );
     // sub->add_flag("-n,--dryrun", dryrun_flag, "");
     // sub->add_flag("-u,--update", update_flag, "");
     // sub->add_flag("-v,--verbose", verbose_flag, "");

src/subcommand/reset_subcommand.cpp

@@ -18,9 +18,28 @@ reset_subcommand::reset_subcommand(const libgit2_object&, CLI::App& app)
 
     sub->add_option("<commit>", m_commit, "The ID of the commit that will become HEAD");
 
-    sub->add_flag("--soft", m_soft_flag, "Leave your working tree files and the index unchanged. For example, if you have no staged changes, you can use" + ansi_code::bold + "git reset --soft HEAD~5" + ansi_code::reset + "; " + ansi_code::bold + "git commit" + ansi_code::reset + " to combine the last 5 commits into 1 commit. This works even with changes in the working tree, which are left untouched, but such usage can lead to confusion.");
-    sub->add_flag("--mixed", m_mixed_flag, "Leave your working directory unchanged. Update the index to match the new HEAD, so nothing will be staged.");
-    sub->add_flag("--hard", m_hard_flag, "Overwrite all files and directories with the version from " + ansi_code::bold + "<commit>" + ansi_code::reset + ", and may overwrite untracked files. Tracked files not in " + ansi_code::bold + "<commit>" + ansi_code::reset + " are removed so that the working tree matches " + ansi_code::bold + "<commit>" + ansi_code::reset + ". Update the index to match the new HEAD, so nothing will be staged.");
+    sub->add_flag(
+        "--soft",
+        m_soft_flag,
+        "Leave your working tree files and the index unchanged. For example, if you have no staged changes, you can use"
+            + ansi_code::bold + "git reset --soft HEAD~5" + ansi_code::reset + "; " + ansi_code::bold
+            + "git commit" + ansi_code::reset
+            + " to combine the last 5 commits into 1 commit. This works even with changes in the working tree, which are left untouched, but such usage can lead to confusion."
+    );
+    sub->add_flag(
+        "--mixed",
+        m_mixed_flag,
+        "Leave your working directory unchanged. Update the index to match the new HEAD, so nothing will be staged."
+    );
+    sub->add_flag(
+        "--hard",
+        m_hard_flag,
+        "Overwrite all files and directories with the version from " + ansi_code::bold + "<commit>"
+            + ansi_code::reset + ", and may overwrite untracked files. Tracked files not in "
+            + ansi_code::bold + "<commit>" + ansi_code::reset
+            + " are removed so that the working tree matches " + ansi_code::bold + "<commit>"
+            + ansi_code::reset + ". Update the index to match the new HEAD, so nothing will be staged."
+    );
 
     sub->callback(
         [this]()

src/subcommand/stash_subcommand.cpp

@@ -27,15 +27,49 @@ bool has_subcommand(CLI::App* cmd)
 stash_subcommand::stash_subcommand(const libgit2_object&, CLI::App& app)
 {
     auto* stash = app.add_subcommand("stash", "Stash the changes in a dirty working directory away\n");
-    auto* push = stash->add_subcommand("push", "Save your local modifications to a new stash entry and roll them back to " + ansi_code::bold + "HEAD " + ansi_code::reset + "(in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state.\n");
-    auto* list = stash->add_subcommand("list", "List the stash entries that you currently have. Each stash entry is listed with its name (e.g. " + ansi_code::bold + "stash@" + ansi_code::reset + "{0} is the latest entry, " + ansi_code::bold + "stash@" + ansi_code::reset + "{1} is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on.\n");  //TODO: check if shows all of that
-    auto* pop = stash->add_subcommand("pop", "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of " + ansi_code::bold + "git stash push.\n" + ansi_code::reset);
-    auto* apply = stash->add_subcommand("apply", "Like " + ansi_code::bold + "pop" + ansi_code::reset + ", but do not remove the state from the stash list. Unlike " + ansi_code::bold + "pop" + ansi_code::reset + ", <stash> may be any commit that looks like a commit created by " + ansi_code::bold + "stash push" + ansi_code::reset + " or " + ".\n");  //TODO: add when "create" is implemented: ansi_code::bold + "stash create" + ansi_code::reset +
-    auto* show = stash->add_subcommand("show", "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created.\n");
+    auto* push = stash->add_subcommand(
+        "push",
+        "Save your local modifications to a new stash entry and roll them back to " + ansi_code::bold
+            + "HEAD " + ansi_code::reset
+            + "(in the working tree and in the index). The <message> part is optional and gives the description along with the stashed state.\n"
+    );
+    auto* list = stash->add_subcommand(
+        "list",
+        "List the stash entries that you currently have. Each stash entry is listed with its name (e.g. "
+            + ansi_code::bold + "stash@" + ansi_code::reset + "{0} is the latest entry, " + ansi_code::bold
+            + "stash@" + ansi_code::reset
+            + "{1} is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on.\n"
+    );  // TODO: check if shows all of that
+    auto* pop = stash->add_subcommand(
+        "pop",
+        "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of "
+            + ansi_code::bold + "git stash push.\n" + ansi_code::reset
+    );
+    auto* apply = stash->add_subcommand(
+        "apply",
+        "Like " + ansi_code::bold + "pop" + ansi_code::reset
+            + ", but do not remove the state from the stash list. Unlike " + ansi_code::bold + "pop"
+            + ansi_code::reset + ", <stash> may be any commit that looks like a commit created by "
+            + ansi_code::bold + "stash push" + ansi_code::reset + " or " + ".\n"
+    );  // TODO: add when "create" is implemented: ansi_code::bold + "stash create" + ansi_code::reset +
+    auto* show = stash->add_subcommand(
+        "show",
+        "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created.\n"
+    );
 
     push->add_option("-m,--message", m_message, "");
-    pop->add_option("--index", m_index, "This option is only valid for " + ansi_code::bold + "pop" + ansi_code::reset + " and " + ansi_code::bold + "apply" + ansi_code::reset + " commands.\n");
-    apply->add_option("--index", m_index, "This option is only valid for " + ansi_code::bold + "pop" + ansi_code::reset + " and " + ansi_code::bold + "apply" + ansi_code::reset + " commands.\n");
+    pop->add_option(
+        "--index",
+        m_index,
+        "This option is only valid for " + ansi_code::bold + "pop" + ansi_code::reset + " and "
+            + ansi_code::bold + "apply" + ansi_code::reset + " commands.\n"
+    );
+    apply->add_option(
+        "--index",
+        m_index,
+        "This option is only valid for " + ansi_code::bold + "pop" + ansi_code::reset + " and "
+            + ansi_code::bold + "apply" + ansi_code::reset + " commands.\n"
+    );
     show->add_flag("--stat", m_stat_flag, "Generate a diffstat\n");
     show->add_flag("--shortstat", m_shortstat_flag, "Output only the last line of --stat\n");
     show->add_flag("--numstat", m_numstat_flag, "Machine-friendly --stat\n");