From: Brandon Casey Date: Sat, 3 Dec 2011 20:35:49 +0000 (-0600) Subject: t/t4131-apply-fake-ancestor.sh: fix broken test X-Git-Tag: v1.7.8.1~3^2~1 X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=590a472b363ba9d6e75b1dbf07f20e80ae9a587d 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t4131-apply-fake-ancestor.sh b/t/t4131-apply-fake-ancestor.sh index 94373ca9a..b1361ce54 100755 --- a/t/t4131-apply-fake-ancestor.sh +++ b/t/t4131-apply-fake-ancestor.sh @@ -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 '