From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Sep 2007 07:14:50 +0000 (-0700)
Subject: Merge branch 'rs/archive'
X-Git-Tag: v1.5.4-rc0~451
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6972ab7ae10a205bbc05b98408a36403915a9c39?hp=-c

Merge branch 'rs/archive'

* rs/archive:
archive - leakfix for format_subst()
Define NO_MEMMEM on Darwin as it lacks the function
archive: rename attribute specfile to export-subst
archive: specfile syntax change: "$Format:%PLCHLDR$" instead of just "%PLCHLDR" (take 2)
add memmem()
Remove unused function convert_sha1_file()
archive: specfile support (--pretty=format: in archive files)
Export format_commit_message()
---

6972ab7ae10a205bbc05b98408a36403915a9c39
diff --combined Makefile
index dace2112f9,c68b530d1e..61053aed56
--- a/Makefile
+++ b/Makefile
@@@ -28,6 -28,8 +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.
@@@ -281,7 -283,7 +283,7 @@@ LIB_FILE=libgit.
  XDIFF_LIB=xdiff/lib.a
  
  LIB_H = \
 -	archive.h blob.h cache.h commit.h csum-file.h delta.h grep.h \
 +	archive.h blob.h cache.h cache-tree.h commit.h csum-file.h delta.h grep.h \
  	diff.h object.h pack.h pkt-line.h quote.h refs.h list-objects.h sideband.h \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \
  	tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \
@@@ -396,12 -398,14 +398,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
@@@ -424,6 -428,7 +428,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
@@@ -442,6 -447,7 +447,7 @@@ ifeq ($(uname_S),FreeBSD
  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
@@@ -456,6 -462,7 +462,7 @@@ ifeq ($(uname_S),NetBSD
  endif
  ifeq ($(uname_S),AIX)
  	NO_STRCASESTR=YesPlease
+ 	NO_MEMMEM = YesPlease
  	NO_STRLCPY = YesPlease
  	NEEDS_LIBICONV=YesPlease
  endif
@@@ -467,6 -474,7 +474,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
@@@ -661,6 -669,10 +669,10 @@@ 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
  
  ifeq ($(TCLTK_PATH),)
  NO_TCLTK=NoThanks