From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Feb 2008 18:01:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~157
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Protect peel_ref fallback case from NULL parse_object result
Ensure 'make dist' compiles git-archive.exe on Cygwin
---

dc31cd8fcc20d95a80da5ebe6feaab01539ebe4c
diff --combined Makefile
index d33a556ffe,7a3c6d1456..a055f11aa6
--- a/Makefile
+++ b/Makefile
@@@ -3,9 -3,6 +3,9 @@@ all:
  
  # Define V=1 to have a more verbose compile.
  #
 +# Define FREAD_READS_DIRECTORIES if your are on a system which succeeds
 +# when attempting to read from an fopen'ed directory.
 +#
  # Define NO_OPENSSL environment variable if you do not have OpenSSL.
  # This also implies MOZILLA_SHA1.
  #
@@@ -140,10 -137,6 +140,10 @@@
  # Define THREADED_DELTA_SEARCH if you have pthreads and wish to exploit
  # parallel delta searching when packing objects.
  #
 +# Define INTERNAL_QSORT to use Git's implementation of qsort(), which
 +# is a simplified version of the merge sort used in glibc. This is
 +# recommended if Git triggers O(n^2) behavior in your platform's qsort().
 +#
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -238,7 -231,7 +238,7 @@@ SCRIPT_SH = 
  	git-lost-found.sh git-quiltimport.sh git-submodule.sh \
  	git-filter-branch.sh \
  	git-stash.sh \
 -	git-help--browse.sh
 +	git-web--browse.sh
  
  SCRIPT_PERL = \
  	git-add--interactive.perl \
@@@ -625,10 -618,6 +625,10 @@@ endi
  ifdef NO_C99_FORMAT
  	BASIC_CFLAGS += -DNO_C99_FORMAT
  endif
 +ifdef FREAD_READS_DIRECTORIES
 +	COMPAT_CFLAGS += -DFREAD_READS_DIRECTORIES
 +	COMPAT_OBJS += compat/fopen.o
 +endif
  ifdef NO_SYMLINK_HEAD
  	BASIC_CFLAGS += -DNO_SYMLINK_HEAD
  endif
@@@ -733,10 -722,6 +733,10 @@@ ifdef NO_MEMME
  	COMPAT_CFLAGS += -DNO_MEMMEM
  	COMPAT_OBJS += compat/memmem.o
  endif
 +ifdef INTERNAL_QSORT
 +	COMPAT_CFLAGS += -DINTERNAL_QSORT
 +	COMPAT_OBJS += compat/qsort.o
 +endif
  
  ifdef THREADED_DELTA_SEARCH
  	BASIC_CFLAGS += -DTHREADED_DELTA_SEARCH
@@@ -834,7 -819,6 +834,7 @@@ git$X: git.o $(BUILTIN_OBJS) $(GITLIBS
  
  help.o: help.c common-cmds.h GIT-CFLAGS
  	$(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) \
 +		'-DGIT_HTML_PATH="$(htmldir_SQ)"' \
  		'-DGIT_MAN_PATH="$(mandir_SQ)"' \
  		'-DGIT_INFO_PATH="$(infodir_SQ)"' $<
  
@@@ -855,6 -839,7 +855,6 @@@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %
  	    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
  	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
  	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
 -	    -e 's|@@HTMLDIR@@|$(htmldir_SQ)|g' \
  	    $@.sh >$@+ && \
  	chmod +x $@+ && \
  	mv $@+ $@
@@@ -1102,7 -1087,7 +1102,7 @@@ git.spec: git.spec.i
  	mv $@+ $@
  
  GIT_TARNAME=git-$(GIT_VERSION)
- dist: git.spec git-archive configure
+ dist: git.spec git-archive$(X) configure
  	./git-archive --format=tar \
  		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
  	@mkdir -p $(GIT_TARNAME)