From: Junio C Hamano <junkio@cox.net>
Date: Tue, 15 Aug 2006 10:13:34 +0000 (-0700)
Subject: Merge branch 'master' into pb/gitpm
X-Git-Tag: v1.4.3-rc1~2^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7b6c3c0f54b951c85cd41c6e6571c65cf090111;p=git.git

Merge branch 'master' into pb/gitpm

* master: (166 commits)
  git-apply --binary: clean up and prepare for --reverse
  Fix detection of ipv6 on Solaris
  Look for sockaddr_storage in sys/socket.h
  Solaris has strlcpy() at least since version 8
  git-apply --reverse: simplify reverse option.
  t4116 apply --reverse test
  Make sha1flush void and remove conditional return.
  Make upload_pack void and remove conditional return.
  Make track_tree_refs void.
  Make pack_objects void.
  Make fsck_dir void.
  Make checkout_all void.
  Make show_entry void
  Make pprint_tag void and cleans up call in cmd_cat_file.
  Remove combine-diff.c::uninteresting()
  read-cache.c cleanup
  http-push.c cleanup
  diff.c cleanup
  builtin-push.c cleanup
  builtin-grep.c cleanup
  ...
---

d7b6c3c0f54b951c85cd41c6e6571c65cf090111
diff --cc Makefile
index 2ab112bbd,b86de761f..ac42ae32b
--- a/Makefile
+++ b/Makefile
@@@ -252,23 -243,53 +253,53 @@@ LIB_OBJS = 
  	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 \
- 	alloc.o merge-file.o path-list.o $(DIFF_OBJS)
+ 	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS)
  
  BUILTIN_OBJS = \
- 	builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \
- 	builtin-grep.o builtin-add.o builtin-rev-list.o builtin-check-ref-format.o \
- 	builtin-rm.o builtin-init-db.o builtin-rev-parse.o \
- 	builtin-tar-tree.o builtin-upload-tar.o builtin-update-index.o \
- 	builtin-ls-files.o builtin-ls-tree.o builtin-write-tree.o \
- 	builtin-read-tree.o builtin-commit-tree.o builtin-mailinfo.o \
- 	builtin-apply.o builtin-show-branch.o builtin-diff-files.o \
- 	builtin-diff-index.o builtin-diff-stages.o builtin-diff-tree.o \
- 	builtin-cat-file.o builtin-mailsplit.o builtin-stripspace.o \
- 	builtin-update-ref.o builtin-fmt-merge-msg.o builtin-prune.o \
- 	builtin-mv.o builtin-prune-packed.o builtin-repo-config.o
+ 	builtin-add.o \
+ 	builtin-apply.o \
+ 	builtin-cat-file.o \
+ 	builtin-checkout-index.o \
+ 	builtin-check-ref-format.o \
+ 	builtin-commit-tree.o \
+ 	builtin-count-objects.o \
+ 	builtin-diff.o \
+ 	builtin-diff-files.o \
+ 	builtin-diff-index.o \
+ 	builtin-diff-stages.o \
+ 	builtin-diff-tree.o \
+ 	builtin-fmt-merge-msg.o \
+ 	builtin-grep.o \
+ 	builtin-init-db.o \
+ 	builtin-log.o \
+ 	builtin-ls-files.o \
+ 	builtin-ls-tree.o \
+ 	builtin-mailinfo.o \
+ 	builtin-mailsplit.o \
+ 	builtin-mv.o \
+ 	builtin-name-rev.o \
+ 	builtin-pack-objects.o \
+ 	builtin-prune.o \
+ 	builtin-prune-packed.o \
+ 	builtin-push.o \
+ 	builtin-read-tree.o \
+ 	builtin-repo-config.o \
+ 	builtin-rev-list.o \
+ 	builtin-rev-parse.o \
+ 	builtin-rm.o \
+ 	builtin-show-branch.o \
+ 	builtin-stripspace.o \
+ 	builtin-symbolic-ref.o \
+ 	builtin-tar-tree.o \
+ 	builtin-unpack-objects.o \
+ 	builtin-update-index.o \
+ 	builtin-update-ref.o \
+ 	builtin-upload-tar.o \
+ 	builtin-verify-pack.o \
+ 	builtin-write-tree.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
 -LIBS = $(GITLIBS) -lz
 +EXTLIBS = -lz
  
  #
  # Platform specific tweaks
@@@ -535,23 -548,14 +565,23 @@@ PERL_PATH_SQ = $(subst ','\'',$(PERL_PA
  PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
  GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
  
 -ALL_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
 +LIBS = $(GITLIBS) $(EXTLIBS)
 +
 +BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
  LIB_OBJS += $(COMPAT_OBJS)
 +
 +ALL_CFLAGS += $(BASIC_CFLAGS)
 +ALL_LDFLAGS += $(BASIC_LDFLAGS)
 +
  export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
 +
 +
  ### Build rules
  
- all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk
+ all: $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk gitweb/gitweb.cgi
  
 -all:
 +all: perl/Makefile
 +	$(MAKE) -C perl
  	$(MAKE) -C templates
  
  strip: $(PROGRAMS) git$X
@@@ -836,10 -844,9 +890,11 @@@ clean
  	rm -rf $(GIT_TARNAME) .doc-tmp-dir
  	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
  	rm -f $(htmldocs).tar.gz $(manpages).tar.gz
+ 	rm -f gitweb/gitweb.cgi
  	$(MAKE) -C Documentation/ clean
 -	$(MAKE) -C templates clean
 +	[ ! -f perl/Makefile ] || $(MAKE) -C perl/ clean || $(MAKE) -C perl/ clean
 +	rm -f perl/ppport.h perl/Makefile.old
 +	$(MAKE) -C templates/ clean
  	$(MAKE) -C t/ clean
  	rm -f GIT-VERSION-FILE GIT-CFLAGS