Skip to content

Commit 432f47a

Browse files
temp(on disk fixup): Introduce failing test
By adding the named branch, this change exposes a problem where - in some cases - branches are not moved to the rewritten commit. Other tests have plenty of branches that are correctly updated during rebase, both in-mem and on-disk. I suspect that, in this case, the issue is that branch is on the destination.
1 parent ab34026 commit 432f47a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

git-branchless/tests/test_move.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5726,7 +5726,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
57265726
"-x",
57275727
&format!("{}+{}", test3_oid, test5_oid),
57285728
"-d",
5729-
&test1_oid.to_string(),
5729+
"test",
57305730
],
57315731
// Use the same mocked system time as the destination commit to coax
57325732
// the commit hashs to match their in-mem counterparts.
@@ -5740,7 +5740,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
57405740
insta::assert_snapshot!(stdout, @r###"
57415741
O f777ecc (master) create initial.txt
57425742
|
5743-
o 38caaaf create test.txt
5743+
o 38caaaf (test) create test.txt
57445744
|
57455745
o 6783c86 update 2 test.txt
57465746
|
@@ -5750,7 +5750,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
57505750
"###);
57515751

57525752
// diff for "create test.txt"
5753-
let diff = git.get_trimmed_diff("test.txt", "38caaaf")?;
5753+
let diff = git.get_trimmed_diff("test.txt", "test")?;
57545754
insta::assert_snapshot!(diff, @r###"
57555755
@@ -0,0 +1,8 @@
57565756
+# Section A

0 commit comments

Comments
 (0)