mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-13 23:57:32 +02:00
Code

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>
This commit is contained in:
Brandon Casey 2011-12-03 14:35:49 -06:00 committed by Junio C Hamano
parent 1e501a7c47
commit 590a472b36
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t4131-apply-fake-ancestor.sh
View File

@ -11,7 +11,7 @@ test_expect_success 'setup' '
test_commit 1 &&
test_commit 2 &&
mkdir sub &&
test_commit 3 sub/3 &&
test_commit 3 sub/3.t &&
test_commit 4
'