Merge branch 'bc/object-id'

diff --git a/builtin/grep.c b/builtin/grep.c
index 9124450163ebf71eec82ee466b155fc2a749d93e..b10062902373590e0ebba0fc960b640b418a07dc 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -1170,8 +1170,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 
        if (!opt.pattern_list)
                die(_("no pattern given."));
-       if (!opt.fixed && opt.ignore_case)
-               opt.regflags |= REG_ICASE;
 
        /*
         * We have to find "--" in a separate pass, because its presence