From: Junio C Hamano Date: Wed, 17 May 2006 09:59:46 +0000 (-0700) Subject: Merge branch 'jc/grep' into next X-Git-Tag: v1.4.1-rc1~97 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fa09339509e5c4c080b137d848c54a5bb21a13f8?hp=-c Merge branch 'jc/grep' into next * jc/grep: builtin-grep: workaround for non GNU grep. --- fa09339509e5c4c080b137d848c54a5bb21a13f8 diff --combined Makefile index daa3fcea18,c67108d253..0aeb94c55d --- a/Makefile +++ b/Makefile @@@ -46,6 -46,8 +46,8 @@@ 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(). @@@ -207,7 -209,7 +209,7 @@@ DIFF_OBJS = 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 \ @@@ -444,6 -446,12 +446,12 @@@ 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)) @@@ -526,6 -534,9 +534,9 @@@ 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)"' $< @@@ -610,9 -621,6 +621,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