author | Brandon Casey <drafnel@gmail.com> | |
Sat, 3 Dec 2011 20:35:49 +0000 (14:35 -0600) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 5 Dec 2011 19:18:51 +0000 (11:18 -0800) | ||
commit | 590a472b363ba9d6e75b1dbf07f20e80ae9a587d | |
tree | 58d897405b73846c6c0f5f6707d77c39925cec14 | tree | snapshot |
parent | 1e501a7c47ad5ada53d3b1acfb9f131f76e969ec | commit | diff |
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 <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4131-apply-fake-ancestor.sh | diff | blob | history |