unpack-trees.c: look ahead in the index

diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index 3a103fec96407e0311bb8724660096548ae6923e..abd14bf819f5c60fc1b9dc758c04974bd24b10a4 100755 (executable)
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -214,6 +214,11 @@ test_expect_success 'grep -e A --and --not -e B' '
        test_cmp expected actual
 '
 
+test_expect_success 'grep should ignore GREP_OPTIONS' '
+       GREP_OPTIONS=-v git grep " mmap bar\$" >actual &&
+       test_cmp expected actual
+'
+
 test_expect_success 'grep -f, non-existent file' '
        test_must_fail git grep -f patterns
 '