Merge branch 'master' into try-insta

cruessler · Dec 10, 2024 · ecffe01 · ecffe01
2 parents a478e2e + 640bf33
commit ecffe01
Show file tree

Hide file tree

Showing 23 changed files with 430 additions and 164 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/asyncgit/src/sync/branch/merge_ff.rs b/asyncgit/src/sync/branch/merge_ff.rs
@@ -50,7 +50,7 @@ pub fn branch_merge_upstream_fastforward(
 }
 
 #[cfg(test)]
-pub mod test {
+mod test {
 	use super::*;
 	use crate::sync::{
 		remotes::{fetch, push::push_branch},

diff --git a/asyncgit/src/sync/config.rs b/asyncgit/src/sync/config.rs
@@ -71,7 +71,6 @@ pub fn untracked_files_config(
 }
 
 /// get string from config
-
 pub fn get_config_string(
 	repo_path: &RepoPath,
 	key: &str,