From: Junio C Hamano <junkio@cox.net>
Date: Wed, 23 Aug 2006 21:18:24 +0000 (-0700)
Subject: Merge branch 'gl/cleanup' into gl/cleanup-next
X-Git-Tag: v1.4.3-rc1~173^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2ad6ba353aa3815894674a0dee56aa75f8a5fc7b;p=git.git

Merge branch 'gl/cleanup' into gl/cleanup-next

* gl/cleanup: (160 commits)
  Convert memset(hash,0,20) to hashclr(hash).
  Convert memcpy(a,b,20) to hashcpy(a,b).
  Fix a comparison bug in diff-delta.c
  git-send-email: Don't set author_not_sender from Cc: lines
  Remove unnecessary forward declaration of unpack_entry.
  Verify we know how to read a pack before trying to using it.
  Add write_or_die(), a helper function
  Axe the last ent
  builtin-mv: readability patch
  git-mv: fix off-by-one error
  git-mv: special case destination "."
  builtin-mv: readability patch
  Indentation fix.
  Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.
  gitweb: Uniquify version info output, add meta generator in page header
  Be nicer if git executable is not installed
  builtin-grep: remove unused debugging cruft.
  gitweb: Add support for per project git URLs
  [PATCH] git-mv: add more path normalization
  Remove the "delay writing to avoid runtime penalty of racy-git avoidance"
  ...
---

2ad6ba353aa3815894674a0dee56aa75f8a5fc7b
diff --cc Makefile
index 1c327c1d5,b15b420ea..f3874d50d
--- a/Makefile
+++ b/Makefile
@@@ -182,24 -192,19 +192,20 @@@ PROGRAMS = 
  	git-send-pack$X git-shell$X \
  	git-show-index$X git-ssh-fetch$X \
  	git-ssh-upload$X git-unpack-file$X \
- 	git-unpack-objects$X git-update-server-info$X \
+ 	git-update-server-info$X \
  	git-upload-pack$X git-verify-pack$X \
- 	git-symbolic-ref$X \
- 	git-name-rev$X git-pack-redundant$X git-var$X \
+ 	git-pack-redundant$X git-var$X \
  	git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
- 	git-merge-recur$X
- 
- BUILT_INS = git-log$X git-whatchanged$X git-show$X git-update-ref$X \
- 	git-count-objects$X git-diff$X git-push$X git-mailsplit$X \
- 	git-grep$X git-add$X git-rm$X git-rev-list$X git-stripspace$X \
- 	git-check-ref-format$X git-rev-parse$X git-mailinfo$X \
- 	git-init-db$X git-tar-tree$X git-upload-tar$X git-format-patch$X \
- 	git-ls-files$X git-ls-tree$X git-get-tar-commit-id$X \
- 	git-read-tree$X git-commit-tree$X git-write-tree$X \
- 	git-apply$X git-show-branch$X git-diff-files$X git-update-index$X \
- 	git-diff-index$X git-diff-stages$X git-diff-tree$X git-cat-file$X \
- 	git-fmt-merge-msg$X git-prune$X git-mv$X git-prune-packed$X \
- 	git-repo-config$X
++	git-merge-recur$X \
+ 	$(EXTRA_PROGRAMS)
+ 
+ # Empty...
+ EXTRA_PROGRAMS =
+ 
+ BUILT_INS = \
+ 	git-format-patch$X git-show$X git-whatchanged$X \
+ 	git-get-tar-commit-id$X \
+ 	$(patsubst builtin-%.o,git-%$X,$(BUILTIN_OBJS))
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)