From 2a9533cb4daf4f36f40dcd2f3416d423749aa98f Mon Sep 17 00:00:00 2001
From: Johan Mabille <johan.mabille@gmail.com>
Date: Thu, 4 Sep 2025 16:04:16 +0200
Subject: [PATCH 1/2] Fixed most of commands creating a git repo instead of
 throwing an error

---
 src/subcommand/add_subcommand.cpp                 |   3 +--
 src/subcommand/commit_subcommand.cpp              |   3 +--
 src/subcommand/log_subcommand.cpp                 |   3 +--
 src/subcommand/reset_subcommand.cpp               |   3 +--
 src/subcommand/status_subcommand.cpp              |   3 +--
 .../48/e0bfd8a7f3ce1af86b7f7b855b25af8386ea54     | Bin 0 -> 173 bytes
 .../56/9457b1226e4b332b86e5e8f7af1bba77e201c3     | Bin 0 -> 172 bytes
 .../93/064f8896c3de87fcfd1b4d990298e868eb56b9     | Bin 0 -> 151 bytes
 .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391     | Bin 0 -> 15 bytes
 test/test_add.py                                  |   8 ++++++++
 test/test_branch.py                               |   5 +++++
 test/test_log.py                                  |   5 +++++
 test/test_reset.py                                |   6 ++++++
 test/test_status.py                               |   4 ++++
 14 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 test/data/status_data/embedded_git/objects/48/e0bfd8a7f3ce1af86b7f7b855b25af8386ea54
 create mode 100644 test/data/status_data/embedded_git/objects/56/9457b1226e4b332b86e5e8f7af1bba77e201c3
 create mode 100644 test/data/status_data/embedded_git/objects/93/064f8896c3de87fcfd1b4d990298e868eb56b9
 create mode 100644 test/data/status_data/embedded_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391

diff --git a/src/subcommand/add_subcommand.cpp b/src/subcommand/add_subcommand.cpp
index 9988d25..51f57c1 100644
--- a/src/subcommand/add_subcommand.cpp
+++ b/src/subcommand/add_subcommand.cpp
@@ -23,8 +23,7 @@ add_subcommand::add_subcommand(const libgit2_object&, CLI::App& app)
 void add_subcommand::run()
 {
     auto directory = get_current_git_path();
-    auto bare = false;
-    auto repo = repository_wrapper::init(directory, bare);
+    auto repo = repository_wrapper::open(directory);
 
     index_wrapper index = repo.make_index();
 
diff --git a/src/subcommand/commit_subcommand.cpp b/src/subcommand/commit_subcommand.cpp
index e70f424..d281ec6 100644
--- a/src/subcommand/commit_subcommand.cpp
+++ b/src/subcommand/commit_subcommand.cpp
@@ -19,8 +19,7 @@ commit_subcommand::commit_subcommand(const libgit2_object&, CLI::App& app)
 void commit_subcommand::run()
 {
     auto directory = get_current_git_path();
-    auto bare = false;
-    auto repo = repository_wrapper::init(directory, bare);
+    auto repo = repository_wrapper::open(directory);
     auto author_committer_signatures = signature_wrapper::get_default_signature_from_env(repo);
 
     if (m_commit_message.empty())
diff --git a/src/subcommand/log_subcommand.cpp b/src/subcommand/log_subcommand.cpp
index c25e270..490569b 100644
--- a/src/subcommand/log_subcommand.cpp
+++ b/src/subcommand/log_subcommand.cpp
@@ -80,8 +80,7 @@ void print_commit(const commit_wrapper& commit, std::string m_format_flag)
 void log_subcommand::run()
 {
     auto directory = get_current_git_path();
-    auto bare = false;
-    auto repo = repository_wrapper::init(directory, bare);
+    auto repo = repository_wrapper::open(directory);
     // auto branch_name = repo.head().short_name();
 
     git_revwalk* walker;
diff --git a/src/subcommand/reset_subcommand.cpp b/src/subcommand/reset_subcommand.cpp
index b862e78..61fa0ae 100644
--- a/src/subcommand/reset_subcommand.cpp
+++ b/src/subcommand/reset_subcommand.cpp
@@ -27,8 +27,7 @@ reset_subcommand::reset_subcommand(const libgit2_object&, CLI::App& app)
 void reset_subcommand::run()
 {
     auto directory = get_current_git_path();
-    auto bare = false;
-    auto repo = repository_wrapper::init(directory, bare);
+    auto repo = repository_wrapper::open(directory);
 
     auto target = repo.revparse_single(m_commit);
     if (!target)
diff --git a/src/subcommand/status_subcommand.cpp b/src/subcommand/status_subcommand.cpp
index 83ebd6d..88a8783 100644
--- a/src/subcommand/status_subcommand.cpp
+++ b/src/subcommand/status_subcommand.cpp
@@ -183,8 +183,7 @@ void print_not_tracked(const std::vector<print_entry>& entries_to_print, const s
 void status_subcommand::run()
 {
     auto directory = get_current_git_path();
-    auto bare = false;
-    auto repo = repository_wrapper::init(directory, bare);
+    auto repo = repository_wrapper::open(directory);
     auto sl = status_list_wrapper::status_list(repo);
     auto branch_name = repo.head().short_name();
 
diff --git a/test/data/status_data/embedded_git/objects/48/e0bfd8a7f3ce1af86b7f7b855b25af8386ea54 b/test/data/status_data/embedded_git/objects/48/e0bfd8a7f3ce1af86b7f7b855b25af8386ea54
new file mode 100644
index 0000000000000000000000000000000000000000..89b5d6e53b2f1a5d72c1598e94990caa6d4dd259
GIT binary patch
literal 173
zcmV;e08;;W0i}*P4#F@H0IB_o?Gealyp|B6qCld92l!Z%pg2as{GXsafpVr8O{}F1
z4WyBqHWPtUywe%cbx|ckn`2HQ=;R!i4hcJ?V7lPg%g;15Ai}6)MysRFf>iL<nCzs>
zWKjq%&?h35nE$lC&Ty%{pWy1lFpdO==MVQ~#nYqsVcf@Bjv%a2h-kEiEtj0L#V(_b
b{z%XiYZ|5p+;8U{GS=wbVC{YZRRvKdx#L#t

literal 0
HcmV?d00001

diff --git a/test/data/status_data/embedded_git/objects/56/9457b1226e4b332b86e5e8f7af1bba77e201c3 b/test/data/status_data/embedded_git/objects/56/9457b1226e4b332b86e5e8f7af1bba77e201c3
new file mode 100644
index 0000000000000000000000000000000000000000..1637ef7425c3a15c5aea44300b4a08d28f73dd65
GIT binary patch
literal 172
zcmV;d08{^X0i}*R3IZ_{0IhS1*Nc*WUO>dkLa@^V<n!XLY&NpS`>S{a%b8-B)M_0&
zNF!H$Ap)<s)dkVpq%xr^sbmp#_MS_Rgcd0p8$El3h2{=Km~<-WbkaqTioqFEy!3?}
z3c&@2Or$akuRgQ|PHhM?oI@O^iC}mC;<o<qaI0aQwyD)U2xk-`8f#(ACFks8Kck)g
aNYI>G9_JfeFUJis*6G>d*L?$5Em1DOu}}5@

literal 0
HcmV?d00001

diff --git a/test/data/status_data/embedded_git/objects/93/064f8896c3de87fcfd1b4d990298e868eb56b9 b/test/data/status_data/embedded_git/objects/93/064f8896c3de87fcfd1b4d990298e868eb56b9
new file mode 100644
index 0000000000000000000000000000000000000000..e6c229d81d88ea79d1ac627ec5c58fce267d1d8d
GIT binary patch
literal 151
zcmV;I0BHYs0V^p=O;s>7H)1d}FfcPQQOM2D&yG*a%t_TNsVHH1Huur&O&6~@dv|ND
zE04Ny=t)oTM5x02l8n@%_>$D(5`^+OD_0a|fB(8#{)^{6p6Ls`s@6FrL6sLJ=B4E4
zB9z{7=Cjeu6P&!coP|+sXTVG~xuQU*QdBedzIV=Hf7dxzGIeU>r78a5R>u?`002;H
FN2|agOHKd)

literal 0
HcmV?d00001

diff --git a/test/data/status_data/embedded_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/data/status_data/embedded_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
new file mode 100644
index 0000000000000000000000000000000000000000..711223894375fe1186ac5bfffdc48fb1fa1e65cc
GIT binary patch
literal 15
Wcmb<m^geacKgb|~fq`=a;|BmLO$9Rm

literal 0
HcmV?d00001

diff --git a/test/test_add.py b/test/test_add.py
index a5055e8..a772779 100644
--- a/test/test_add.py
+++ b/test/test_add.py
@@ -32,3 +32,11 @@ def test_add(xtl_clone, git2cpp_path, tmp_path, all_flag):
         assert "Untracked files" not in p_status.stdout
     else:
         assert "Untracked files" in p_status.stdout
+
+def test_add_nogit(git2cpp_path, tmp_path):
+    p = tmp_path / "mook_file.txt"
+    p.write_text('')
+
+    cmd_add = [git2cpp_path, 'add', 'mook_file.txt']
+    p_add = subprocess.run(cmd_add, cwd=tmp_path, text=True)
+    assert p_add.returncode != 0
diff --git a/test/test_branch.py b/test/test_branch.py
index 4e1f9fe..f81bc8c 100644
--- a/test/test_branch.py
+++ b/test/test_branch.py
@@ -33,3 +33,8 @@ def test_branch_create_delete(xtl_clone, git2cpp_path, tmp_path):
     p_list2 = subprocess.run(list_cmd, capture_output=True, cwd=xtl_path, text=True)
     assert p_list2.returncode == 0
     assert(p_list2.stdout == '* master\n')
+
+def test_branch_nogit(git2cpp_path, tmp_path):
+    cmd = [git2cpp_path, 'branch']
+    p = subprocess.run(cmd, capture_output=True, cwd=tmp_path, text=True)
+    assert p.returncode != 0
diff --git a/test/test_log.py b/test/test_log.py
index 659c7a4..d7dae3d 100644
--- a/test/test_log.py
+++ b/test/test_log.py
@@ -35,6 +35,11 @@ def test_log(xtl_clone, git_config, git2cpp_path, tmp_path, monkeypatch, format_
         else:
             assert "CommitDate" in p_log.stdout
 
+def test_log_nogit(git_config, git2cpp_path, tmp_path):
+    cmd_log = [git2cpp_path, 'log']
+    p_log = subprocess.run(cmd_log, capture_output=True, cwd=tmp_path, text=True)
+    assert p_log.returncode != 0
+
 
 @pytest.mark.parametrize("max_count_flag", ["", "-n", "--max-count"])
 def test_max_count(xtl_clone, git_config, git2cpp_path, tmp_path, monkeypatch, max_count_flag):
diff --git a/test/test_reset.py b/test/test_reset.py
index 74e9aa1..3b86a1d 100644
--- a/test/test_reset.py
+++ b/test/test_reset.py
@@ -31,3 +31,9 @@ def test_reset(xtl_clone, git_config, git2cpp_path, tmp_path, monkeypatch):
     p_log = subprocess.run(cmd_log_2, capture_output=True, cwd=xtl_path, text=True)
     assert p_log.returncode == 0
     assert "Jane Doe" not in p_log.stdout
+
+def test_reset_nogit(git2cpp_path, tmp_path):
+    cmd_reset = [git2cpp_path, "reset", "--hard", "HEAD~1"]
+    p_reset = subprocess.run(cmd_reset, capture_output=True, cwd=tmp_path, text=True)
+    assert p_reset.returncode != 0
+
diff --git a/test/test_status.py b/test/test_status.py
index cfacb7b..ab7288e 100644
--- a/test/test_status.py
+++ b/test/test_status.py
@@ -38,6 +38,10 @@ def test_status_new_file(xtl_clone, git2cpp_path, tmp_path, short_flag, long_fla
         assert " D " in p.stdout
         assert "?? " in p.stdout
 
+def test_status_nogit(git2cpp_path, tmp_path):
+    cmd = [git2cpp_path, 'status']
+    p = subprocess.run(cmd, capture_output=True, cwd=tmp_path, text=True)
+    assert p.returncode != 0
 
 @pytest.mark.parametrize("short_flag", ["", "-s", "--short"])
 @pytest.mark.parametrize("long_flag", ["", "--long"])

From 5b5c7b88d81daa9e5744136305e0ef1274d07115 Mon Sep 17 00:00:00 2001
From: Johan Mabille <johan.mabille@gmail.com>
Date: Fri, 5 Sep 2025 11:04:25 +0200
Subject: [PATCH 2/2] Removed remaining test/data files

---
 .../48/e0bfd8a7f3ce1af86b7f7b855b25af8386ea54     | Bin 173 -> 0 bytes
 .../56/9457b1226e4b332b86e5e8f7af1bba77e201c3     | Bin 172 -> 0 bytes
 .../93/064f8896c3de87fcfd1b4d990298e868eb56b9     | Bin 151 -> 0 bytes
 .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391     | Bin 15 -> 0 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 test/data/status_data/embedded_git/objects/48/e0bfd8a7f3ce1af86b7f7b855b25af8386ea54
 delete mode 100644 test/data/status_data/embedded_git/objects/56/9457b1226e4b332b86e5e8f7af1bba77e201c3
 delete mode 100644 test/data/status_data/embedded_git/objects/93/064f8896c3de87fcfd1b4d990298e868eb56b9
 delete mode 100644 test/data/status_data/embedded_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391

diff --git a/test/data/status_data/embedded_git/objects/48/e0bfd8a7f3ce1af86b7f7b855b25af8386ea54 b/test/data/status_data/embedded_git/objects/48/e0bfd8a7f3ce1af86b7f7b855b25af8386ea54
deleted file mode 100644
index 89b5d6e53b2f1a5d72c1598e94990caa6d4dd259..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 173
zcmV;e08;;W0i}*P4#F@H0IB_o?Gealyp|B6qCld92l!Z%pg2as{GXsafpVr8O{}F1
z4WyBqHWPtUywe%cbx|ckn`2HQ=;R!i4hcJ?V7lPg%g;15Ai}6)MysRFf>iL<nCzs>
zWKjq%&?h35nE$lC&Ty%{pWy1lFpdO==MVQ~#nYqsVcf@Bjv%a2h-kEiEtj0L#V(_b
b{z%XiYZ|5p+;8U{GS=wbVC{YZRRvKdx#L#t

diff --git a/test/data/status_data/embedded_git/objects/56/9457b1226e4b332b86e5e8f7af1bba77e201c3 b/test/data/status_data/embedded_git/objects/56/9457b1226e4b332b86e5e8f7af1bba77e201c3
deleted file mode 100644
index 1637ef7425c3a15c5aea44300b4a08d28f73dd65..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmV;d08{^X0i}*R3IZ_{0IhS1*Nc*WUO>dkLa@^V<n!XLY&NpS`>S{a%b8-B)M_0&
zNF!H$Ap)<s)dkVpq%xr^sbmp#_MS_Rgcd0p8$El3h2{=Km~<-WbkaqTioqFEy!3?}
z3c&@2Or$akuRgQ|PHhM?oI@O^iC}mC;<o<qaI0aQwyD)U2xk-`8f#(ACFks8Kck)g
aNYI>G9_JfeFUJis*6G>d*L?$5Em1DOu}}5@

diff --git a/test/data/status_data/embedded_git/objects/93/064f8896c3de87fcfd1b4d990298e868eb56b9 b/test/data/status_data/embedded_git/objects/93/064f8896c3de87fcfd1b4d990298e868eb56b9
deleted file mode 100644
index e6c229d81d88ea79d1ac627ec5c58fce267d1d8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 151
zcmV;I0BHYs0V^p=O;s>7H)1d}FfcPQQOM2D&yG*a%t_TNsVHH1Huur&O&6~@dv|ND
zE04Ny=t)oTM5x02l8n@%_>$D(5`^+OD_0a|fB(8#{)^{6p6Ls`s@6FrL6sLJ=B4E4
zB9z{7=Cjeu6P&!coP|+sXTVG~xuQU*QdBedzIV=Hf7dxzGIeU>r78a5R>u?`002;H
FN2|agOHKd)

diff --git a/test/data/status_data/embedded_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/test/data/status_data/embedded_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
deleted file mode 100644
index 711223894375fe1186ac5bfffdc48fb1fa1e65cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15
Wcmb<m^geacKgb|~fq`=a;|BmLO$9Rm