Fix error when git add fails because .gitmodules doesn't exist

Pistonite · Dec 3, 2023 · d7468e8 · d7468e8
1 parent 66e76cb
commit d7468e8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "magoo"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 description = "A wrapper for git submodule that simplifies the workflows"
 repository = "https://github.com/Pistonite/magoo"

diff --git a/src/submodule.rs b/src/submodule.rs
@@ -460,7 +460,8 @@ impl Submodule {
                 top_level_dir.join(".gitmodules"),
                 &format!("submodule.{name}"),
             );
-            context.add(".gitmodules")?;
+            // add may fail if .gitmodules doesn't exist
+            let _ = context.add(".gitmodules");
         }
         self.in_gitmodules = None;
         Ok(())
@@ -471,7 +472,8 @@ impl Submodule {
         if let Some(in_index) = &self.in_index {
             println_info!("Deleting `{}` in index", in_index.path);
             context.remove_from_index(&in_index.path)?;
-            context.add(".gitmodules")?;
+            // add may fail if .gitmodules doesn't exist
+            let _ = context.add(".gitmodules");
         }
         self.in_index = None;
         Ok(())