From: Junio C Hamano Date: Fri, 6 Jun 2014 18:32:49 +0000 (-0700) Subject: Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' X-Git-Tag: v2.1.0-rc0~155 X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/7e03f416633b5dbd242d6552e239d50a821262c6?hp=7173ad76edfb016500cc7a97f35b067964085ac8 Merge branch 'sk/spawn-less-case-insensitively-from-grep-O-i' * sk/spawn-less-case-insensitively-from-grep-O-i: git grep -O -i: if the pager is 'less', pass the '-I' option --- diff --git a/builtin/grep.c b/builtin/grep.c index 43af5b744f..c86a142f30 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -872,6 +872,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix) if (len > 4 && is_dir_sep(pager[len - 5])) pager += len - 4; + if (opt.ignore_case && !strcmp("less", pager)) + string_list_append(&path_list, "-I"); + if (!strcmp("less", pager) || !strcmp("vi", pager)) { struct strbuf buf = STRBUF_INIT; strbuf_addf(&buf, "+/%s%s",