Merge branch 'jc/grep' into next

* jc/grep:
Revert "builtin-grep: workaround for non GNU grep."

diff --combined Makefile
index 2c87886c444a7dbaa9dc74e5f9e2ae84bdbdb00e,9ba608c805e6a9864414a963422094ae010e4a86..a1d2e08ace61ab74919f506a1d81cbf6a54b3103
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -46,8 -46,6 +46,6 @@@ all
  #
  # Define NO_MMAP if you want to avoid mmap.
  #
- # Define NO_H_OPTION_IN_GREP if your grep does not understand -H.
- #
  # Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
  #
  # Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
@@@ -201,7 -199,7 +199,7 @@@ LIB_H = 
        blob.h cache.h commit.h csum-file.h delta.h \
        diff.h object.h pack.h pkt-line.h quote.h refs.h \
        run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
 -      tree-walk.h log-tree.h
 +      tree-walk.h log-tree.h dir.h
  
  DIFF_OBJS = \
        diff.o diff-lib.o diffcore-break.o diffcore-order.o \
@@@ -209,10 -207,10 +207,10 @@@
        diffcore-delta.o log-tree.o
  
  LIB_OBJS = \
 -      blob.o commit.o connect.o csum-file.o base85.o \
 +      blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
        date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
        object.o pack-check.o patch-delta.o path.o pkt-line.o \
 -      quote.o read-cache.o refs.o run-command.o \
 +      quote.o read-cache.o refs.o run-command.o dir.o \
        server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
        tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
        fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
@@@ -220,7 -218,7 +218,7 @@@
  
  BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
 -      builtin-grep.o
 +      builtin-grep.o builtin-add.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz
@@@ -446,12 -444,6 +444,6 @@@ ifdef NO_ACCURATE_DIF
        ALL_CFLAGS += -DNO_ACCURATE_DIFF
  endif
  
- ifdef NO_H_OPTION_IN_GREP
-       NO_H_OPTION_IN_GREP=1
- else
-       NO_H_OPTION_IN_GREP=0
- endif
- 
  # Shell quote (do not use $(call) to accomodate ancient setups);
  
  SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))
@@@ -534,9 -526,6 +526,6 @@@ git$X git.spec 
  %.o: %.S
        $(CC) -o $*.o -c $(ALL_CFLAGS) $<
  
- builtin-grep.o: builtin-grep.c
-       $(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_H_OPTION_IN_GREP=$(NO_H_OPTION_IN_GREP) $<
- 
  exec_cmd.o: exec_cmd.c
        $(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' $<
  
@@@ -621,9 -610,6 +610,9 @@@ test-date$X: test-date.c date.o ctype.
  test-delta$X: test-delta.c diff-delta.o patch-delta.o
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $^
  
 +test-dump-cache-tree$X: dump-cache-tree.o $(GITLIBS)
 +      $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +
  check:
        for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done