Skip to content

Commit c16fc6e

Browse files
committed
Disambiguate the fold recovery revision on Windows
1 parent f0a00b0 commit c16fc6e

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

‎internal/modify/apply_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4053,7 +4053,7 @@ func TestDistributedModify_FoldUpDropNormalizationRecovery(t *testing.T) {
40534053
require.NoError(t, os.WriteFile(filepath.Join(repo.origin, "base.txt"), []byte("C\n"), 0644))
40544054
runModifyGit(t, repo.origin, "add", "base.txt")
40554055
require.NoError(t, ContinueApply(cfg, repo.common, noopUpdateBaseSHAs))
4056-
assert.Equal(t, "C", runModifyGit(t, repo.root, "show", "C:base.txt"))
4056+
assert.Equal(t, "C", runModifyGit(t, repo.root, "show", "C:base.txt", "--"))
40574057
assert.Equal(t, "A\nC", runModifyGit(t, repo.root, "log", "--reverse", "--format=%s", "main..C"))
40584058
saved, err = stack.Load(repo.common)
40594059
require.NoError(t, err)

0 commit comments

Comments
 (0)