summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorMax Kirillov <max@max630.net>2014-06-28 22:04:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-30 21:07:48 (GMT)
commit6d49de414f9dc7a94503a3798dd745971669cebe (patch)
treebb7208685db08776a1031395da9b6babf23c81f7 /t/t6023-merge-file.sh
parent7fe683480124239ec0ab555c9b529e4c54707d7b (diff)
downloadgit-6d49de414f9dc7a94503a3798dd745971669cebe.zip
git-6d49de414f9dc7a94503a3798dd745971669cebe.tar.gz
git-6d49de414f9dc7a94503a3798dd745971669cebe.tar.bz2
t6023-merge-file.sh: fix and mark as broken invalid tests
Tests "merge without conflict (missing LF at EOF" and "merge result added missing LF" are meaningless - the first one is identical to "merge without conflict" and the second compares results of those identical tests, which are always same. This has been so since their addition in ba1f5f3537. Probably "new4.txt" was meant to be used instead of "new2.txt". Unfortunately, the current merge-file breaks with new4 - conflict is reported. They also fail at that revision if fixed. Fix the file reference to "new4.txt" and mark the tests as failing - they look like legitimate expectations, just not satisfied at time being. Signed-off-by: Max Kirillov <max@max630.net> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
-rwxr-xr-xt/t6023-merge-file.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 432f086..3115285 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -77,10 +77,10 @@ test_expect_success "merge without conflict (--quiet)" \
"git merge-file --quiet test.txt orig.txt new2.txt"
cp new1.txt test2.txt
-test_expect_success "merge without conflict (missing LF at EOF)" \
- "git merge-file test2.txt orig.txt new2.txt"
+test_expect_failure "merge without conflict (missing LF at EOF)" \
+ "git merge-file test2.txt orig.txt new4.txt"
-test_expect_success "merge result added missing LF" \
+test_expect_failure "merge result added missing LF" \
"test_cmp test.txt test2.txt"
cp test.txt backup.txt