Skip to content

Commit 590a472

Browse files
drafnelgitster
authored andcommitted
t/t4131-apply-fake-ancestor.sh: fix broken test
The third test "apply --build-fake-ancestor in a subdirectory" has been broken since it was introduced. It intended to modify a tracked file named 'sub/3.t' and then produce a diff which could be git apply'ed, but the file named 'sub/3.t' does not exist. The file that exists in the repo is called 'sub/3'. Since no tracked files were modified, an empty diff was produced, and the test succeeded. Correct this test by supplying the intended name of the tracked file, 'sub/3.t', to test_commit in the first test. Signed-off-by: Brandon Casey <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1e501a7 commit 590a472

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t4131-apply-fake-ancestor.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test_expect_success 'setup' '
1111
test_commit 1 &&
1212
test_commit 2 &&
1313
mkdir sub &&
14-
test_commit 3 sub/3 &&
14+
test_commit 3 sub/3.t &&
1515
test_commit 4
1616
'
1717

0 commit comments

Comments
 (0)