From 55d64756467c0d166c9f8ad1bcf33df4650c351e Mon Sep 17 00:00:00 2001
From: Karl Heitmann <khf1988@gmail.com>
Date: Thu, 15 Jun 2023 23:58:23 -0400
Subject: [PATCH 1/3] Uses git-graph.toml to parse commits message format

---
 src/main.rs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index 90af35d..dc30698 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,6 +21,11 @@ use std::time::Instant;
 
 const REPO_CONFIG_FILE: &str = "git-graph.toml";
 
+#[derive(serde_derive::Serialize, serde_derive::Deserialize)]
+pub struct CommitFormatToml {
+    pub format: String,
+}
+
 fn main() {
     std::process::exit(match from_args() {
         Ok(_) => 0,
@@ -289,7 +294,19 @@ fn from_args() -> Result<(), String> {
     )?;
 
     let format = match matches.get_one::<String>("format") {
-        None => CommitFormat::OneLine,
+        None => { 
+            let mut config_path = std::path::PathBuf::from(repository.path());
+            config_path.push(REPO_CONFIG_FILE);
+            if config_path.exists() {
+                let commit_format_toml: CommitFormatToml = toml::from_str(
+                    &std::fs::read_to_string(config_path).map_err(|err| err.to_string())?,
+                )
+                .map_err(|err| err.to_string()).unwrap();
+                CommitFormat::from_str(&commit_format_toml.format)?
+            } else {
+                CommitFormat::OneLine
+            }
+        },
         Some(str) => CommitFormat::from_str(str)?,
     };
 

From ad439a45a5c9f81a14185627f40a8d92e68a1600 Mon Sep 17 00:00:00 2001
From: Karl Heitmann <khf1988@gmail.com>
Date: Fri, 16 Jun 2023 00:25:12 -0400
Subject: [PATCH 2/3] Wraps in Option attributes to prevent to crash if some
 are missing

---
 src/config.rs   | 10 +++++++---
 src/main.rs     |  7 +++++--
 src/settings.rs |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index fced474..fa595cc 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -60,7 +60,7 @@ pub fn get_model_name(repository: &Repository, file_name: &str) -> Result<Option
             toml::from_str(&std::fs::read_to_string(config_path).map_err(|err| err.to_string())?)
                 .map_err(|err| err.to_string())?;
 
-        Ok(Some(repo_config.model))
+        Ok(repo_config.model)
     } else {
         Ok(None)
     }
@@ -86,7 +86,11 @@ pub fn get_model<P: AsRef<Path> + AsRef<OsStr>>(
                 )
                 .map_err(|err| err.to_string())?;
 
-                read_model(&repo_config.model, app_model_path)
+                match repo_config.model {
+                    None => Ok(read_model("git-flow", app_model_path)
+                                .unwrap_or_else(|_| BranchSettingsDef::git_flow())),
+                    Some(model) => read_model(&model, app_model_path)
+                }
             } else {
                 Ok(read_model("git-flow", app_model_path)
                     .unwrap_or_else(|_| BranchSettingsDef::git_flow()))
@@ -141,7 +145,7 @@ pub fn set_model<P: AsRef<Path>>(
     config_path.push(repo_config_file);
 
     let config = RepoSettings {
-        model: model.to_string(),
+        model: Some(model.to_string()),
     };
 
     let str = toml::to_string_pretty(&config).map_err(|err| err.to_string())?;
diff --git a/src/main.rs b/src/main.rs
index dc30698..6b80015 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,7 +23,7 @@ const REPO_CONFIG_FILE: &str = "git-graph.toml";
 
 #[derive(serde_derive::Serialize, serde_derive::Deserialize)]
 pub struct CommitFormatToml {
-    pub format: String,
+    pub format: Option<String>,
 }
 
 fn main() {
@@ -302,7 +302,10 @@ fn from_args() -> Result<(), String> {
                     &std::fs::read_to_string(config_path).map_err(|err| err.to_string())?,
                 )
                 .map_err(|err| err.to_string()).unwrap();
-                CommitFormat::from_str(&commit_format_toml.format)?
+                match commit_format_toml.format {
+                    None => CommitFormat::OneLine,
+                    Some(format) => CommitFormat::from_str(&format)?
+                }
             } else {
                 CommitFormat::OneLine
             }
diff --git a/src/settings.rs b/src/settings.rs
index 2d78f2b..e684b18 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -10,7 +10,7 @@ use std::str::FromStr;
 #[derive(Serialize, Deserialize)]
 pub struct RepoSettings {
     /// The repository's branching model
-    pub model: String,
+    pub model: Option<String>,
 }
 
 /// Ordering policy for branches in visual columns.

From b808d0cb4e28f7dff0d6ae60034fd2de8e007f87 Mon Sep 17 00:00:00 2001
From: Karl Heitmann <khf1988@gmail.com>
Date: Tue, 20 Jun 2023 23:02:34 -0400
Subject: [PATCH 3/3] Appease linter

---
 src/config.rs | 4 ++--
 src/main.rs   | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index fa595cc..6365b64 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -88,8 +88,8 @@ pub fn get_model<P: AsRef<Path> + AsRef<OsStr>>(
 
                 match repo_config.model {
                     None => Ok(read_model("git-flow", app_model_path)
-                                .unwrap_or_else(|_| BranchSettingsDef::git_flow())),
-                    Some(model) => read_model(&model, app_model_path)
+                        .unwrap_or_else(|_| BranchSettingsDef::git_flow())),
+                    Some(model) => read_model(&model, app_model_path),
                 }
             } else {
                 Ok(read_model("git-flow", app_model_path)
diff --git a/src/main.rs b/src/main.rs
index 6b80015..3908670 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -294,22 +294,23 @@ fn from_args() -> Result<(), String> {
     )?;
 
     let format = match matches.get_one::<String>("format") {
-        None => { 
+        None => {
             let mut config_path = std::path::PathBuf::from(repository.path());
             config_path.push(REPO_CONFIG_FILE);
             if config_path.exists() {
                 let commit_format_toml: CommitFormatToml = toml::from_str(
                     &std::fs::read_to_string(config_path).map_err(|err| err.to_string())?,
                 )
-                .map_err(|err| err.to_string()).unwrap();
+                .map_err(|err| err.to_string())
+                .unwrap();
                 match commit_format_toml.format {
                     None => CommitFormat::OneLine,
-                    Some(format) => CommitFormat::from_str(&format)?
+                    Some(format) => CommitFormat::from_str(&format)?,
                 }
             } else {
                 CommitFormat::OneLine
             }
-        },
+        }
         Some(str) => CommitFormat::from_str(str)?,
     };