Skip to content

Commit 250952d

Browse files
committed
Disambiguate the fold recovery revision on Windows
1 parent 0b56055 commit 250952d

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
@@ -3836,7 +3836,7 @@ func TestDistributedModify_FoldUpDropNormalizationRecovery(t *testing.T) {
38363836
require.NoError(t, os.WriteFile(filepath.Join(repo.origin, "base.txt"), []byte("C\n"), 0644))
38373837
runModifyGit(t, repo.origin, "add", "base.txt")
38383838
require.NoError(t, ContinueApply(cfg, repo.common, noopUpdateBaseSHAs))
3839-
assert.Equal(t, "C", runModifyGit(t, repo.root, "show", "C:base.txt"))
3839+
assert.Equal(t, "C", runModifyGit(t, repo.root, "show", "C:base.txt", "--"))
38403840
assert.Equal(t, "A\nC", runModifyGit(t, repo.root, "log", "--reverse", "--format=%s", "main..C"))
38413841
saved, err = stack.Load(repo.common)
38423842
require.NoError(t, err)

0 commit comments

Comments
 (0)