From 92c63982d6db41304457d56b565e2ba209cf38a0 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Fri, 8 Mar 2024 20:59:39 +0000
Subject: fix: stack overflow bug

introduced in 098b0258fdd581c750099cb463adbddb57843388
---
 src/git.rs | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'src/git.rs')

diff --git a/src/git.rs b/src/git.rs
index bb2b8e7..6de9e90 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -147,7 +147,7 @@ impl RepoActions for Repo {
         {
             Ok(main_tuple)
         } else {
-            self.get_main_or_master_branch()
+            self.get_local_main_or_master_branch()
                 .context("the default branches (main or master) do not exist")
         }
     }
@@ -1124,6 +1124,30 @@ mod tests {
     mod get_main_or_master_branch {
 
         use super::*;
+
+        #[test]
+        fn return_origin_main_if_exists() -> Result<()> {
+            let test_origin_repo = GitTestRepo::new("main")?;
+            let main_origin_oid = test_origin_repo.populate()?;
+
+            let test_repo = GitTestRepo::new("main")?;
+            test_repo.populate()?;
+            test_repo.add_remote("origin", test_origin_repo.dir.to_str().unwrap())?;
+            test_repo
+                .git_repo
+                .find_remote("origin")?
+                .fetch(&["main"], None, None)?;
+
+            std::fs::write(test_repo.dir.join("t3.md"), "some content")?;
+            test_repo.stage_and_commit("add t3.md")?;
+
+            let git_repo = Repo::from_path(&test_repo.dir)?;
+            let (name, commit_hash) = git_repo.get_main_or_master_branch()?;
+            assert_eq!(name, "origin/main");
+            assert_eq!(commit_hash, oid_to_sha1(&main_origin_oid));
+            Ok(())
+        }
+
         mod returns_main {
             use super::*;
             #[test]
-- 
cgit v1.2.3