git-branchless/tests/test_move.rs

@@ -6684,3 +6684,43 @@ fn test_move_fixup_conflict() -> eyre::Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn test_move_fixup_added_files() -> eyre::Result<()> {
+    let git = make_git()?;
+    git.init_repo()?;
+    git.detach_head()?;
+
+    git.commit_file("test1", 1)?;
+    git.commit_file("test2", 2)?;
+
+    let (stdout, _stderr) = git.run(&[
+        "move",
+        "--in-memory",
+        "--fixup",
+        "-x",
+        "HEAD",
+        "-d",
+        "HEAD~",
+    ])?;
+
+    insta::assert_snapshot!(stdout, @r###"
+    Attempting rebase in-memory...
+    [1/1] Committed as: e9f8a2b create test1.txt
+    branchless: processing 2 rewritten commits
+    branchless: running command: <git-executable> checkout e9f8a2b1e4c72b2ca31c5f2feffabc947e2f1b5a
+    O f777ecc (master) create initial.txt
+    |
+    @ e9f8a2b create test1.txt
+    In-memory rebase succeeded.
+    "###);
+
+    let (stdout, _stderr) = git.run(&["ls-files"])?;
+    insta::assert_snapshot!(stdout, @r###"
+    initial.txt
+    test1.txt
+    test2.txt
+    "###);
+
+    Ok(())
+}