From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Sep 2007 07:30:33 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~418
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/41ef95aea7c8d8a337af693b601511e099cc468f?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Do not over-quote the -f envelopesender value.
unexpected Make output (e.g. from --debug) causes build failure
Fixed minor typo in t/t9001-send-email.sh test command line.
---

41ef95aea7c8d8a337af693b601511e099cc468f
diff --combined Makefile
index 0055eef24d,42ba1d0fa7..97ce687606
--- a/Makefile
+++ b/Makefile
@@@ -28,8 -28,6 +28,8 @@@ all:
  #
  # Define NO_STRCASESTR if you don't have strcasestr.
  #
 +# Define NO_MEMMEM if you don't have memmem.
 +#
  # Define NO_STRLCPY if you don't have strlcpy.
  #
  # Define NO_STRTOUMAX if you don't have strtoumax in the C library.
@@@ -124,9 -122,6 +124,9 @@@
  # If not set it defaults to the bare 'wish'. If it is set to the empty
  # string then NO_TCLTK will be forced (this is used by configure script).
  #
 +# Define THREADED_DELTA_SEARCH if you have pthreads and wish to exploit
 +# parallel delta searching when packing objects.
 +#
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -211,7 -206,7 +211,7 @@@ SCRIPT_SH = 
  	git-ls-remote.sh \
  	git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
  	git-pull.sh git-rebase.sh git-rebase--interactive.sh \
 -	git-repack.sh git-request-pull.sh git-reset.sh \
 +	git-repack.sh git-request-pull.sh \
  	git-sh-setup.sh \
  	git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
@@@ -358,7 -353,6 +358,7 @@@ BUILTIN_OBJS = 
  	builtin-reflog.o \
  	builtin-config.o \
  	builtin-rerere.o \
 +	builtin-reset.o \
  	builtin-rev-list.o \
  	builtin-rev-parse.o \
  	builtin-revert.o \
@@@ -402,14 -396,12 +402,14 @@@ ifeq ($(uname_S),Darwin
  	NEEDS_LIBICONV = YesPlease
  	OLD_ICONV = UnfortunatelyYes
  	NO_STRLCPY = YesPlease
 +	NO_MEMMEM = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
  	NEEDS_SOCKET = YesPlease
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
  	NO_STRCASESTR = YesPlease
 +	NO_MEMMEM = YesPlease
  	NO_HSTRERROR = YesPlease
  	ifeq ($(uname_R),5.8)
  		NEEDS_LIBICONV = YesPlease
@@@ -432,7 -424,6 +432,7 @@@ ifeq ($(uname_O),Cygwin
  	NO_D_TYPE_IN_DIRENT = YesPlease
  	NO_D_INO_IN_DIRENT = YesPlease
  	NO_STRCASESTR = YesPlease
 +	NO_MEMMEM = YesPlease
  	NO_SYMLINK_HEAD = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
@@@ -446,13 -437,11 +446,13 @@@
  endif
  ifeq ($(uname_S),FreeBSD)
  	NEEDS_LIBICONV = YesPlease
 +	NO_MEMMEM = YesPlease
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),OpenBSD)
  	NO_STRCASESTR = YesPlease
 +	NO_MEMMEM = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	BASIC_CFLAGS += -I/usr/local/include
  	BASIC_LDFLAGS += -L/usr/local/lib
@@@ -467,7 -456,6 +467,7 @@@ ifeq ($(uname_S),NetBSD
  endif
  ifeq ($(uname_S),AIX)
  	NO_STRCASESTR=YesPlease
 +	NO_MEMMEM = YesPlease
  	NO_STRLCPY = YesPlease
  	NEEDS_LIBICONV=YesPlease
  endif
@@@ -479,7 -467,6 +479,7 @@@ ifeq ($(uname_S),IRIX64
  	NO_IPV6=YesPlease
  	NO_SETENV=YesPlease
  	NO_STRCASESTR=YesPlease
 +	NO_MEMMEM = YesPlease
  	NO_STRLCPY = YesPlease
  	NO_SOCKADDR_STORAGE=YesPlease
  	SHELL_PATH=/usr/gnu/bin/bash
@@@ -674,15 -661,6 +674,15 @@@ ifdef NO_HSTRERRO
  	COMPAT_CFLAGS += -DNO_HSTRERROR
  	COMPAT_OBJS += compat/hstrerror.o
  endif
 +ifdef NO_MEMMEM
 +	COMPAT_CFLAGS += -DNO_MEMMEM
 +	COMPAT_OBJS += compat/memmem.o
 +endif
 +
 +ifdef THREADED_DELTA_SEARCH
 +	BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
 +	EXTLIBS += -lpthread
 +endif
  
  ifeq ($(TCLTK_PATH),)
  NO_TCLTK=NoThanks
@@@ -805,7 -783,7 +805,7 @@@ perl/perl.mak: GIT-CFLAG
  
  $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
  	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
  	sed -e '1{' \
  	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
  	    -e '	h' \