Skip to content

Commit 8de6518

Browse files
committed
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 <[email protected]>
1 parent cfe370c commit 8de6518

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

t/t7002-grep.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,17 @@ test_expect_success setup '
2525
echo foo mmap bar_mmap
2626
echo foo_mmap bar mmap baz
2727
} >file &&
28+
echo vvv >v &&
2829
echo ww w >w &&
2930
echo x x xx x >x &&
3031
echo y yy >y &&
3132
echo zzz > z &&
3233
mkdir t &&
3334
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 . &&
3539
test_tick &&
3640
git commit -m initial
3741
'

0 commit comments

Comments
 (0)