squash! feat(move): add test for move --reparent

Author: bryango

git-branchless/tests/test_move.rs

@@ -6381,28 +6381,11 @@ fn test_move_reparent() -> eyre::Result<()> {
 
     git.branchless("prev", &[])?;
     {
-        let (stdout, _stderr) = git.run(&["show"])?;
+        let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "HEAD"])?;
         insta::assert_snapshot!(stdout, @r"
-        commit 40ca3815e2167cd8a464493414ea4340d65230a7
-        Author: Testy McTestface <test@example.com>
-        Date:   Thu Oct 29 12:34:56 2020 -0200
-
-            create test2_will_also_contain_test1_when_reparented.txt
-
-        diff --git a/test1.txt b/test1.txt
-        new file mode 100644
-        index 0000000..7432a8f
-        --- /dev/null
-        +++ b/test1.txt
-        @@ -0,0 +1 @@
-        +test1 contents
-        diff --git a/test2_will_also_contain_test1_when_reparented.txt b/test2_will_also_contain_test1_when_reparented.txt
-        new file mode 100644
-        index 0000000..1619c31
-        --- /dev/null
-        +++ b/test2_will_also_contain_test1_when_reparented.txt
-        @@ -0,0 +1 @@
-        +test2_will_also_contain_test1_when_reparented contents
+        test1.txt                                         | 1 +
+        test2_will_also_contain_test1_when_reparented.txt | 1 +
+        2 files changed, 2 insertions(+)
         ");
     }
 
@@ -6443,82 +6426,31 @@ fn test_move_reparent() -> eyre::Result<()> {
     // the reparented test3 contains everything, including test1 and test2
     git.branchless("prev", &[])?;
     {
-        let (stdout, _stderr) = git.run(&["show"])?;
+        let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "HEAD"])?;
         insta::assert_snapshot!(stdout, @r"
-        commit 3f0558d435e63ebdfd1e81f5dbd3ddfaca387864
-        Author: Testy McTestface <test@example.com>
-        Date:   Thu Oct 29 12:34:56 2020 -0300
-
-            create test3_will_also_contain_test2_when_reparented.txt
-
-        diff --git a/test1.txt b/test1.txt
-        new file mode 100644
-        index 0000000..7432a8f
-        --- /dev/null
-        +++ b/test1.txt
-        @@ -0,0 +1 @@
-        +test1 contents
-        diff --git a/test2_will_also_contain_test1_when_reparented.txt b/test2_will_also_contain_test1_when_reparented.txt
-        new file mode 100644
-        index 0000000..1619c31
-        --- /dev/null
-        +++ b/test2_will_also_contain_test1_when_reparented.txt
-        @@ -0,0 +1 @@
-        +test2_will_also_contain_test1_when_reparented contents
-        diff --git a/test3_will_also_contain_test2_when_reparented.txt b/test3_will_also_contain_test2_when_reparented.txt
-        new file mode 100644
-        index 0000000..0829100
-        --- /dev/null
-        +++ b/test3_will_also_contain_test2_when_reparented.txt
-        @@ -0,0 +1 @@
-        +test3_will_also_contain_test2_when_reparented contents
+        test1.txt                                         | 1 +
+        test2_will_also_contain_test1_when_reparented.txt | 1 +
+        test3_will_also_contain_test2_when_reparented.txt | 1 +
+        3 files changed, 3 insertions(+)
         ");
     }
 
     // the descendant test2 should come without test3 like before
     {
-        let (stdout, _stderr) = git.run(&["show", "e1e0b99"])?;
+        let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "e1e0b99"])?;
         insta::assert_snapshot!(stdout, @r"
-        commit e1e0b9952583334793f781ef25a6ce8d861cf85f
-        Author: Testy McTestface <test@example.com>
-        Date:   Thu Oct 29 12:34:56 2020 -0200
-
-            create test2_will_also_contain_test1_when_reparented.txt
-
-        diff --git a/test3_will_also_contain_test2_when_reparented.txt b/test3_will_also_contain_test2_when_reparented.txt
-        deleted file mode 100644
-        index 0829100..0000000
-        --- a/test3_will_also_contain_test2_when_reparented.txt
-        +++ /dev/null
-        @@ -1 +0,0 @@
-        -test3_will_also_contain_test2_when_reparented contents
+        test3_will_also_contain_test2_when_reparented.txt | 1 -
+        1 file changed, 1 deletion(-)
         ");
     }
 
     // similarly the descendant test1 should come without test1 and test2
     {
-        let (stdout, _stderr) = git.run(&["show", "fee6ba0"])?;
+        let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "fee6ba0"])?;
         insta::assert_snapshot!(stdout, @r"
-        commit fee6ba034168cd7e83a93784c6c62cd9fb682d5a
-        Author: Testy McTestface <test@example.com>
-        Date:   Thu Oct 29 12:34:56 2020 -0100
-
-            create test1.txt
-
-        diff --git a/test2_will_also_contain_test1_when_reparented.txt b/test2_will_also_contain_test1_when_reparented.txt
-        deleted file mode 100644
-        index 1619c31..0000000
-        --- a/test2_will_also_contain_test1_when_reparented.txt
-        +++ /dev/null
-        @@ -1 +0,0 @@
-        -test2_will_also_contain_test1_when_reparented contents
-        diff --git a/test3_will_also_contain_test2_when_reparented.txt b/test3_will_also_contain_test2_when_reparented.txt
-        deleted file mode 100644
-        index 0829100..0000000
-        --- a/test3_will_also_contain_test2_when_reparented.txt
-        +++ /dev/null
-        @@ -1 +0,0 @@
-        -test3_will_also_contain_test2_when_reparented contents
+        test2_will_also_contain_test1_when_reparented.txt | 1 -
+        test3_will_also_contain_test2_when_reparented.txt | 1 -
+        2 files changed, 2 deletions(-)
         ");
     }
 
@@ -6553,28 +6485,11 @@ fn test_move_reparent() -> eyre::Result<()> {
     }
 
     {
-        let (stdout, _stderr) = git.run(&["show", "40ca381"])?;
+        let (stdout, _stderr) = git.run(&["show", "--pretty=format:", "--stat", "40ca381"])?;
         insta::assert_snapshot!(stdout, @r"
-        commit 40ca3815e2167cd8a464493414ea4340d65230a7
-        Author: Testy McTestface <test@example.com>
-        Date:   Thu Oct 29 12:34:56 2020 -0200
-
-            create test2_will_also_contain_test1_when_reparented.txt
-
-        diff --git a/test1.txt b/test1.txt
-        new file mode 100644
-        index 0000000..7432a8f
-        --- /dev/null
-        +++ b/test1.txt
-        @@ -0,0 +1 @@
-        +test1 contents
-        diff --git a/test2_will_also_contain_test1_when_reparented.txt b/test2_will_also_contain_test1_when_reparented.txt
-        new file mode 100644
-        index 0000000..1619c31
-        --- /dev/null
-        +++ b/test2_will_also_contain_test1_when_reparented.txt
-        @@ -0,0 +1 @@
-        +test2_will_also_contain_test1_when_reparented contents
+        test1.txt                                         | 1 +
+        test2_will_also_contain_test1_when_reparented.txt | 1 +
+        2 files changed, 2 insertions(+)
         ");
     }