Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-22 13:03:26 +0400
committerJunio C Hamano <gitster@pobox.com>2008-06-22 13:03:26 +0400
commit7f8365f894d60f240edd356f32e3c1bda994ed41 (patch)
treec9e58c23437b9ccd51da537ba86298b99d0181a8
parent51e0d0a67b8d31e92d52e15b577afb079359ec63 (diff)
t4200: fix rerere test
The test used "diff-files -q" which is not about reporting if there is a difference at all. Instead, make sure that the path remains as conflicting in the index after rerere autoresolves it, as we will be adding rerere.autoupdate configuration with the next patch.
-rwxr-xr-xt/t4200-rerere.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 85d7e3edcd..afb3e3d176 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -193,9 +193,9 @@ test_expect_success 'resolution was recorded properly' '
echo Bello > file3 &&
git add file3 &&
git commit -m version2 &&
- ! git merge fifth &&
- git diff-files -q &&
- test Cello = "$(cat file3)"
+ test_must_fail git merge fifth &&
+ test Cello = "$(cat file3)" &&
+ test 0 != $(git ls-files -u | wc -l)
'
test_done