Skip to content

Commit 34349be

Browse files
gitstergitster
committed
Merge branch 'jc/grep-lookahead'
* jc/grep-lookahead: grep --no-index: allow use of "git grep" outside a git repository grep: prepare to run outside of a work tree grep: rip out pessimization to use fixmatch() grep: rip out support for external grep grep: optimize built-in grep by skipping lines that do not hit Conflicts: builtin-grep.c t/t7002-grep.sh
2 parents 886932e + 3081623 commit 34349be

File tree

7 files changed

+166
-370
lines changed

7 files changed

+166
-370
lines changed

‎Documentation/config.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -664,14 +664,6 @@ color.grep::
664664
`never`), never. When set to `true` or `auto`, use color only
665665
when the output is written to the terminal. Defaults to `false`.
666666

667-
color.grep.external::
668-
The string value of this variable is passed to an external 'grep'
669-
command as a command line option if match highlighting is turned
670-
on. If set to an empty string, no option is passed at all,
671-
turning off coloring for external 'grep' calls; this is the default.
672-
For GNU grep, set it to `--color=always` to highlight matches even
673-
when a pager is used.
674-
675667
color.grep.match::
676668
Use customized color for matches. The value of this variable
677669
may be specified as in color.branch.<slot>. It is passed using

‎Makefile‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@ all::
187187
# is a simplified version of the merge sort used in glibc. This is
188188
# recommended if Git triggers O(n^2) behavior in your platform's qsort().
189189
#
190-
# Define NO_EXTERNAL_GREP if you don't want "git grep" to ever call
191-
# your external grep (e.g., if your system lacks grep, if its grep is
192-
# broken, or spawning external process is slower than built-in grep git has).
193-
#
194190
# Define UNRELIABLE_FSTAT if your system's fstat does not return the same
195191
# information on a not yet closed file that lstat would return for the same
196192
# file after it was closed.
@@ -795,7 +791,6 @@ ifeq ($(uname_S),SunOS)
795791
NO_MKDTEMP = YesPlease
796792
NO_MKSTEMPS = YesPlease
797793
NO_REGEX = YesPlease
798-
NO_EXTERNAL_GREP = YesPlease
799794
THREADED_DELTA_SEARCH = YesPlease
800795
ifeq ($(uname_R),5.7)
801796
NEEDS_RESOLV = YesPlease
@@ -914,7 +909,6 @@ ifeq ($(uname_S),IRIX)
914909
# NO_MMAP. If you suspect that your compiler is not affected by this
915910
# issue, comment out the NO_MMAP statement.
916911
NO_MMAP = YesPlease
917-
NO_EXTERNAL_GREP = UnfortunatelyYes
918912
SNPRINTF_RETURNS_BOGUS = YesPlease
919913
SHELL_PATH = /usr/gnu/bin/bash
920914
NEEDS_LIBGEN = YesPlease
@@ -934,7 +928,6 @@ ifeq ($(uname_S),IRIX64)
934928
# NO_MMAP. If you suspect that your compiler is not affected by this
935929
# issue, comment out the NO_MMAP statement.
936930
NO_MMAP = YesPlease
937-
NO_EXTERNAL_GREP = UnfortunatelyYes
938931
SNPRINTF_RETURNS_BOGUS = YesPlease
939932
SHELL_PATH=/usr/gnu/bin/bash
940933
NEEDS_LIBGEN = YesPlease
@@ -1349,9 +1342,6 @@ endif
13491342
ifdef DIR_HAS_BSD_GROUP_SEMANTICS
13501343
COMPAT_CFLAGS += -DDIR_HAS_BSD_GROUP_SEMANTICS
13511344
endif
1352-
ifdef NO_EXTERNAL_GREP
1353-
BASIC_CFLAGS += -DNO_EXTERNAL_GREP
1354-
endif
13551345
ifdef UNRELIABLE_FSTAT
13561346
BASIC_CFLAGS += -DUNRELIABLE_FSTAT
13571347
endif

0 commit comments

Comments
 (0)