From ed5ef7310ebafc04aabfb6af504dfbada325ae9a Mon Sep 17 00:00:00 2001 From: Clayton Carter Date: Thu, 10 Aug 2023 21:25:02 -0400 Subject: [PATCH] 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. --- git-branchless/tests/test_move.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-branchless/tests/test_move.rs b/git-branchless/tests/test_move.rs index e31c8af59..46e4282ad 100644 --- a/git-branchless/tests/test_move.rs +++ b/git-branchless/tests/test_move.rs @@ -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. @@ -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 | @@ -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