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.
Junio C Hamano committed
Jun 22, 2008 at 02:03 UTC
7f8365f894d60f240edd356f32e3c1bda994ed41
1 file changed
+3
-3
t/t4200-rerere.sh
+3
-3
@@ -193,9 +193,9 @@ test_expect_success 'resolution was recorded properly' '
193
echo Bello > file3 &&
194
git add file3 &&
195
git commit -m version2 &&
196
- ! git merge fifth &&
197
- git diff-files -q &&
198
- test Cello = "$(cat file3)"
196
+ test_must_fail git merge fifth &&
197
+ test Cello = "$(cat file3)" &&
198
+ test 0 != $(git ls-files -u | wc -l)
199
'
200
201
test_done