Fix mis-backport of t7002
The original patch that became cfe370c (grep: do not segfault when -f is used, 2009-10-16), was made against "maint" or newer branch back then, but the fix addressed the issue that was present as far as in 1.6.4 series. The maintainer backported the patch to the 1.6.4 maintenance branch, but failed to notice that the new tests assumed the setup done by the script in "maint", which did quite a lot more than the same test script in 1.6.4 series, and the output didn't match the expected result. This should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 18, 2010 at 21:14 UTC
8de65185e873d361ede4d6994ef257e4ac55f37d
1 file changed
+5
-1
t/t7002-grep.sh
+5
-1
@@ -25,13 +25,17 @@ test_expect_success setup '
25
echo foo mmap bar_mmap
26
echo foo_mmap bar mmap baz
27
} >file &&
28
+ echo vvv >v &&
29
echo ww w >w &&
30
echo x x xx x >x &&
31
echo y yy >y &&
32
echo zzz > z &&
33
mkdir t &&
34
echo test >t/t &&
34
- git add file w x y z t/t hello.c &&
35
+ echo vvv >t/v &&
36
+ mkdir t/a &&
37
+ echo vvv >t/a/v &&
38
+ git add . &&
39
test_tick &&
40
git commit -m initial
41
'