diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-18 21:18:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-18 21:18:41 -0800 |
| commit | 18d97f5fedc4e464fa9b5d8096b5a9f7e42364fa (patch) | |
| tree | 0bbfb740677e5318e2828ff6a7df9f48e78ea39d /t | |
| parent | f1be316ada93158507c315ee7948bb9e6007eb91 (diff) | |
| parent | 8de65185e873d361ede4d6994ef257e4ac55f37d (diff) | |
| download | git-18d97f5fedc4e464fa9b5d8096b5a9f7e42364fa.tar.gz git-18d97f5fedc4e464fa9b5d8096b5a9f7e42364fa.tar.xz | |
Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4
* commit 'v1.6.4.4-8-g8de6518':
Fix mis-backport of t7002
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7002-grep.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh index 5f91d8229..7a5f28a32 100755 --- a/t/t7002-grep.sh +++ b/t/t7002-grep.sh @@ -25,13 +25,17 @@ test_expect_success setup ' echo foo mmap bar_mmap echo foo_mmap bar mmap baz } >file && + echo vvv >v && echo ww w >w && echo x x xx x >x && echo y yy >y && echo zzz > z && mkdir t && echo test >t/t && - git add file w x y z t/t hello.c && + echo vvv >t/v && + mkdir t/a && + echo vvv >t/a/v && + git add . && test_tick && git commit -m initial ' |