Skip to content

Commit

Permalink
temp(on disk fixup): Introduce failing test
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
claytonrcarter committed Dec 10, 2024
1 parent 8d1f132 commit ed5ef73
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions git-branchless/tests/test_move.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5727,7 +5727,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
"-x",
&format!("{}+{}", test3_oid, test5_oid),
"-d",
&test1_oid.to_string(),
"test",
],
// Use the same mocked system time as the destination commit to coax
// the commit hashs to match their in-mem counterparts.
Expand All @@ -5741,7 +5741,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
insta::assert_snapshot!(stdout, @r###"
O f777ecc (master) create initial.txt
|
o 38caaaf create test.txt
o 38caaaf (test) create test.txt
|
o 6783c86 update 2 test.txt
|
Expand All @@ -5751,7 +5751,7 @@ fn test_move_fixup_multiple_disconnected_into_ancestor() -> eyre::Result<()> {
"###);

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

0 comments on commit ed5ef73

Please sign in to comment.