Minor improvements for branch subcommand

Author: JohanMabille

src/subcommand/branch_subcommand.cpp

@@ -25,19 +25,7 @@ void branch_subcommand::run()
 
     if (m_list_flag || m_branch_name.empty())
     {
-        auto head_name = repo.head().short_name();
-        std::cout << "* " << head_name << std::endl;
-        git_branch_t type = m_all_flag ? GIT_BRANCH_ALL : (m_remote_flag ? GIT_BRANCH_REMOTE : GIT_BRANCH_LOCAL);
-        auto iter = repo.iterate_branches(type);
-        auto br = iter.next();
-        while (br)
-        {
-            if (br->name() != head_name)
-            {
-                std::cout << "  " << br->name() << std::endl;
-            }
-            br = iter.next();
-        }
+        run_list(repo);
     }
     else if (m_deletion_flag)
     {
@@ -49,6 +37,26 @@ void branch_subcommand::run()
     }
 }
 
+void branch_subcommand::run_list(const repository_wrapper& repo)
+{
+    auto head_name = repo.head().short_name();
+    git_branch_t type = m_all_flag ? GIT_BRANCH_ALL : (m_remote_flag ? GIT_BRANCH_REMOTE : GIT_BRANCH_LOCAL);
+    auto iter = repo.iterate_branches(type);
+    auto br = iter.next();
+    while (br)
+    {
+        if (br->name() != head_name)
+        {
+            std::cout << "  " << br->name() << std::endl;
+        }
+        else
+        {
+            std::cout << "* " << br->name() << std::endl;
+        }
+        br = iter.next();
+    }
+}
+
 void branch_subcommand::run_deletion(repository_wrapper& repo)
 {
     auto branch = repo.find_branch(m_branch_name);

src/subcommand/branch_subcommand.hpp

@@ -16,6 +16,7 @@ class branch_subcommand
 
 private:
 
+    void run_list(const repository_wrapper& repo);
     void run_deletion(repository_wrapper& repo);
     void run_creation(repository_wrapper& repo);
 

src/utils/git_exception.cpp

@@ -4,8 +4,9 @@
 
 void throwIfError(int exitCode)
 {
-    if (exitCode < 0) {
-        throw GitException(git_error_last()->message, exitCode);
+    if (exitCode < 0)
+    {
+        throw GitException("error: " + std::string(git_error_last()->message), exitCode);
     }
 }
 

test/test_branch.py

@@ -13,7 +13,7 @@ def test_branch_create_delete(rename_git, git2cpp_path):
     subprocess.run(create_cmd, capture_output=True, cwd="test/data/status_data", text=True)
     list_cmd = [git2cpp_path, 'branch']
     p = subprocess.run(list_cmd, capture_output=True, cwd="test/data/status_data", text=True)
-    assert(p.stdout == '* main\n  foregone\n')
+    assert(p.stdout == '  foregone\n* main\n')
     del_cmd = [git2cpp_path, 'branch', '-d', 'foregone']
     subprocess.run(del_cmd, capture_output=True, cwd="test/data/status_data", text=True)
     p2 = subprocess.run(list_cmd, capture_output=True, cwd="test/data/status_data", text=True)