From: Junio C Hamano <junkio@cox.net>
Date: Mon, 2 Oct 2006 18:49:59 +0000 (-0700)
Subject: Merge branch 'master' into lj/refs
X-Git-Tag: v1.4.4-rc1~44^2~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ff989b8d466ee2ec42c69c02e6551add430b8497;p=git.git

Merge branch 'master' into lj/refs

* master: (99 commits)
  lock_ref_sha1_basic does not remove empty directories on BSD
  git-push: .git/remotes/ file does not require SP after colon
  git-mv: invalidate the removed path properly in cache-tree
  Makefile: install and clean merge-recur, still.
  GIT 1.4.3-rc1
  gitweb: tree view: hash_base and hash are now context sensitive
  git-diff -B output fix.
  fetch: Reset remote refs list each time fetch_main is called
  Remove -fPIC which was only needed for Git.xs
  Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34
  git-diff -B output fix.
  Make cvsexportcommit remove files.
  diff --stat: ensure at least one '-' for deletions, and one '+' for additions
  diff --stat=width[,name-width]: allow custom diffstat output width.
  gitweb: History: blob and tree are first, then commitdiff, etc
  gitweb: Remove redundant "commit" from history
  http/ftp: optionally ask curl to not use EPSV command
  gitweb: Don't use quotemeta on internally generated strings
  gitweb: Add snapshot to shortlog
  gitweb: Factor out gitweb_have_snapshot()
  ...
---

ff989b8d466ee2ec42c69c02e6551add430b8497
diff --cc Makefile
index 65fb8284f,401b893bf..e826247cc
--- a/Makefile
+++ b/Makefile
@@@ -300,12 -306,10 +307,12 @@@ BUILTIN_OBJS = 
  	builtin-update-ref.o \
  	builtin-upload-archive.o \
  	builtin-verify-pack.o \
 -	builtin-write-tree.o
 +	builtin-write-tree.o \
 +	builtin-show-ref.o \
 +	builtin-pack-refs.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
- LIBS = $(GITLIBS) -lz
+ EXTLIBS = -lz
  
  #
  # Platform specific tweaks