fix(import): patch numbers not stripped from name

If patch series was exported using numbered order, importing the series
will keep the patch number as part of its name.

Author: aelgogary

src/cmd/import.rs

@@ -703,12 +703,11 @@ fn create_patch<'repo>(
 }
 
 fn stripname(name: &str) -> &str {
-    name.trim_start_matches(|c: char| c.is_ascii_digit() || c == '-')
-        .rsplit_once(".diff")
-        .map_or_else(
-            || name.rsplit_once(".patch").map_or(name, |(name, _)| name),
-            |(name, _)| name,
-        )
+    let name = name.trim_start_matches(|c: char| c.is_ascii_digit() || c == '-');
+    name.rsplit_once(".diff").map_or_else(
+        || name.rsplit_once(".patch").map_or(name, |(name, _)| name),
+        |(name, _)| name,
+    )
 }
 
 fn split_patch(content: Vec<u8>) -> Result<(BString, BString)> {
@@ -738,7 +737,7 @@ fn split_patch(content: Vec<u8>) -> Result<(BString, BString)> {
 mod test {
     use bstr::B;
 
-    use super::split_patch;
+    use super::{split_patch, stripname};
 
     #[test]
     fn patch_without_message() {
@@ -818,6 +817,24 @@ mod test {
         assert_eq!(message, "");
         assert!(diff.starts_with(b"--- filename.txt"));
     }
+
+    #[test]
+    fn patch_name_with_numbered_order_and_patch_extension() {
+        let name = String::from("01-patch-name.patch");
+        assert_eq!(stripname(&name), "patch-name");
+    }
+
+    #[test]
+    fn patch_name_with_numbered_order_and_diff_extension() {
+        let name = String::from("01-patch-name.diff");
+        assert_eq!(stripname(&name), "patch-name");
+    }
+
+    #[test]
+    fn patch_name_with_numbered_order_and_diff_patch_extension() {
+        let name = String::from("01-patch-name.diff.patch");
+        assert_eq!(stripname(&name), "patch-name");
+    }
 }
 
 #[derive(Default, Debug)]