Skip to content

Commit ed5ef73

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 8d1f132 commit ed5ef73

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
@@ -5727,7 +5727,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
57275727
"-x",
57285728
&format!("{}+{}", test3_oid, test5_oid),
57295729
"-d",
5730-
&test1_oid.to_string(),
5730+
"test",
57315731
],
57325732
// Use the same mocked system time as the destination commit to coax
57335733
// the commit hashs to match their in-mem counterparts.
@@ -5741,7 +5741,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
57415741
insta::assert_snapshot!(stdout, @r###"
57425742
O f777ecc (master) create initial.txt
57435743
|
5744-
o 38caaaf create test.txt
5744+
o 38caaaf (test) create test.txt
57455745
|
57465746
o 6783c86 update 2 test.txt
57475747
|
@@ -5751,7 +5751,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
57515751
"###);
57525752

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

0 commit comments

Comments
 (0)