Skip to content

Commit bbc09c2

Browse files
gitstergitster
committed
grep: rip out support for external grep
We still allow people to pass --[no-]ext-grep on the command line, but the option is ignored. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent e2d2e38 commit bbc09c2

File tree

5 files changed

+8
-324
lines changed

5 files changed

+8
-324
lines changed

‎Documentation/config.txt‎

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

648-
color.grep.external::
649-
The string value of this variable is passed to an external 'grep'
650-
command as a command line option if match highlighting is turned
651-
on. If set to an empty string, no option is passed at all,
652-
turning off coloring for external 'grep' calls; this is the default.
653-
For GNU grep, set it to `--color=always` to highlight matches even
654-
when a pager is used.
655-
656648
color.grep.match::
657649
Use customized color for matches. The value of this variable
658650
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
@@ -185,10 +185,6 @@ all::
185185
# is a simplified version of the merge sort used in glibc. This is
186186
# recommended if Git triggers O(n^2) behavior in your platform's qsort().
187187
#
188-
# Define NO_EXTERNAL_GREP if you don't want "git grep" to ever call
189-
# your external grep (e.g., if your system lacks grep, if its grep is
190-
# broken, or spawning external process is slower than built-in grep git has).
191-
#
192188
# Define UNRELIABLE_FSTAT if your system's fstat does not return the same
193189
# information on a not yet closed file that lstat would return for the same
194190
# file after it was closed.
@@ -777,7 +773,6 @@ ifeq ($(uname_S),SunOS)
777773
NO_MKDTEMP = YesPlease
778774
NO_MKSTEMPS = YesPlease
779775
NO_REGEX = YesPlease
780-
NO_EXTERNAL_GREP = YesPlease
781776
THREADED_DELTA_SEARCH = YesPlease
782777
ifeq ($(uname_R),5.7)
783778
NEEDS_RESOLV = YesPlease
@@ -895,7 +890,6 @@ ifeq ($(uname_S),IRIX)
895890
# NO_MMAP. If you suspect that your compiler is not affected by this
896891
# issue, comment out the NO_MMAP statement.
897892
NO_MMAP = YesPlease
898-
NO_EXTERNAL_GREP = UnfortunatelyYes
899893
SNPRINTF_RETURNS_BOGUS = YesPlease
900894
SHELL_PATH = /usr/gnu/bin/bash
901895
NEEDS_LIBGEN = YesPlease
@@ -915,7 +909,6 @@ ifeq ($(uname_S),IRIX64)
915909
# NO_MMAP. If you suspect that your compiler is not affected by this
916910
# issue, comment out the NO_MMAP statement.
917911
NO_MMAP = YesPlease
918-
NO_EXTERNAL_GREP = UnfortunatelyYes
919912
SNPRINTF_RETURNS_BOGUS = YesPlease
920913
SHELL_PATH=/usr/gnu/bin/bash
921914
NEEDS_LIBGEN = YesPlease
@@ -1322,9 +1315,6 @@ endif
13221315
ifdef DIR_HAS_BSD_GROUP_SEMANTICS
13231316
COMPAT_CFLAGS += -DDIR_HAS_BSD_GROUP_SEMANTICS
13241317
endif
1325-
ifdef NO_EXTERNAL_GREP
1326-
BASIC_CFLAGS += -DNO_EXTERNAL_GREP
1327-
endif
13281318
ifdef UNRELIABLE_FSTAT
13291319
BASIC_CFLAGS += -DUNRELIABLE_FSTAT
13301320
endif

0 commit comments

Comments
 (0)