Fix new files claiming they have permission changes

Wilfred · Mar 5, 2024 · 7346c89 · 7346c89
1 parent b95e6cc
commit 7346c89
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/src/options.rs b/src/options.rs
@@ -352,15 +352,15 @@ impl Display for FilePermissions {
     }
 }
 
-impl From<String> for FilePermissions {
-    fn from(s: String) -> Self {
-        Self(s)
-    }
-}
+impl TryFrom<&OsStr> for FilePermissions {
+    type Error = ();
 
-impl From<&OsStr> for FilePermissions {
-    fn from(s: &OsStr) -> Self {
-        Self(s.to_string_lossy().into_owned())
+    fn try_from(s: &OsStr) -> Result<Self, Self::Error> {
+        if s == "." {
+            Err(())
+        } else {
+            Ok(Self(s.to_string_lossy().into_owned()))
+        }
     }
 }
 
@@ -760,8 +760,8 @@ pub(crate) fn parse_args() -> Mode {
                 display_path.to_string_lossy().to_string(),
                 FileArgument::from_path_argument(lhs_tmp_file),
                 FileArgument::from_path_argument(rhs_tmp_file),
-                Some((*lhs_mode).into()),
-                Some((*rhs_mode).into()),
+                FilePermissions::try_from(*lhs_mode).ok(),
+                FilePermissions::try_from(*rhs_mode).ok(),
                 None,
             )
         }
@@ -778,8 +778,8 @@ pub(crate) fn parse_args() -> Mode {
                 new_name,
                 FileArgument::from_path_argument(lhs_tmp_file),
                 FileArgument::from_path_argument(rhs_tmp_file),
-                Some((*lhs_mode).into()),
-                Some((*rhs_mode).into()),
+                FilePermissions::try_from(*lhs_mode).ok(),
+                FilePermissions::try_from(*rhs_mode).ok(),
                 Some(renamed),
             )
         }

diff --git a/tests/cli.rs b/tests/cli.rs
@@ -202,6 +202,21 @@ fn git_style_arguments_rename() {
     cmd.assert().stdout(predicate_fn);
 }
 
+#[test]
+fn git_style_arguments_new_file() {
+    let mut cmd = get_base_command();
+
+    cmd.arg("simple.txt")
+        .arg("/dev/null")
+        .arg(".")
+        .arg(".")
+        .arg("sample_files/simple_before.txt")
+        .arg("abcdef1234")
+        .arg("100644");
+    let predicate_fn = predicate::str::contains("File permissions changed").not();
+    cmd.assert().stdout(predicate_fn);
+}
+
 #[test]
 fn drop_different_path_starts() {
     let mut cmd = get_base_command();