address review comments

Author: SandrineP

src/subcommand/checkout_subcommand.cpp

@@ -20,6 +20,23 @@ checkout_subcommand::checkout_subcommand(const libgit2_object&, CLI::App& app)
     sub->callback([this]() { this->run(); });
 }
 
+void print_no_switch(status_list_wrapper& sl)
+{
+    std::cout << "Your local changes to the following files would be overwritten by checkout:" << std::endl;
+
+    for (const auto* entry : sl.get_entry_list(GIT_STATUS_WT_MODIFIED))
+    {
+        std::cout << "\t" << entry->index_to_workdir->new_file.path << std::endl;
+    }
+    for (const auto* entry : sl.get_entry_list(GIT_STATUS_WT_DELETED))
+    {
+        std::cout << "\t" << entry->index_to_workdir->old_file.path << std::endl;
+    }
+
+    std::cout << "Please commit your changes or stash them before you switch branches.\nAborting" << std::endl;
+    return;
+}
+
 void checkout_subcommand::run()
 {
     auto directory = get_current_git_path();
@@ -37,10 +54,10 @@ void checkout_subcommand::run()
     {
         options.checkout_strategy = GIT_CHECKOUT_FORCE;
     }
-    // else
-    // {
-    //     options.checkout_strategy = GIT_CHECKOUT_SAFE;
-    // }
+    else
+    {
+        options.checkout_strategy = GIT_CHECKOUT_SAFE;
+    }
 
     if (m_create_flag || m_force_create_flag)
     {
@@ -71,25 +88,9 @@ void checkout_subcommand::run()
         {
             if (sl.has_notstagged_header())
             {
-                std::cout << "Your local changes to the following files would be overwritten by checkout:" << std::endl;
-
-                for (const auto* entry : sl.get_entry_list(GIT_STATUS_WT_MODIFIED))
-                {
-                    std::cout << "\t" << entry->index_to_workdir->new_file.path << std::endl;
-                }
-                for (const auto* entry : sl.get_entry_list(GIT_STATUS_WT_DELETED))
-                {
-                    std::cout << "\t" << entry->index_to_workdir->old_file.path << std::endl;
-                }
-
-                std::cout << "Please commit your changes or stash them before you switch branches.\nAborting" << std::endl;
-                return;
-            }
-            else
-            {
-                throw e;
+                print_no_switch(sl);
             }
-            return;
+            throw e;
         }
 
         if (sl.has_notstagged_header())

src/subcommand/checkout_subcommand.hpp

@@ -12,7 +12,6 @@ class checkout_subcommand
 {
 public:
 
-    void print_message(repository_wrapper& repo);
     explicit checkout_subcommand(const libgit2_object&, CLI::App& app);
     void run();
 

test/test_checkout.py

@@ -167,7 +167,7 @@ def test_checkout_refuses_overwrite(
     )
 
     if force_flag == "":
-        assert p_checkout.returncode == 0
+        assert p_checkout.returncode != 0
         assert (
             "Your local changes to the following files would be overwritten by checkout:"
             in p_checkout.stdout