summaryrefslogtreecommitdiff
path: root/t/t4131-apply-fake-ancestor.sh
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2011-12-03 14:35:49 -0600
committerJunio C Hamano <gitster@pobox.com>2011-12-05 11:18:51 -0800
commit590a472b363ba9d6e75b1dbf07f20e80ae9a587d (patch)
tree58d897405b73846c6c0f5f6707d77c39925cec14 /t/t4131-apply-fake-ancestor.sh
parent1e501a7c47ad5ada53d3b1acfb9f131f76e969ec (diff)
downloadgit-590a472b363ba9d6e75b1dbf07f20e80ae9a587d.tar.gz
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>
Diffstat (limited to 't/t4131-apply-fake-ancestor.sh')
-rwxr-xr-xt/t4131-apply-fake-ancestor.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4131-apply-fake-ancestor.sh b/t/t4131-apply-fake-ancestor.sh
index 94373ca9a0..b1361ce546 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
'