From: Junio C Hamano <junkio@cox.net>
Date: Sun, 24 Sep 2006 23:58:34 +0000 (-0700)
Subject: Merge branch 'jl/daemon'
X-Git-Tag: v1.4.3-rc1~45
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/043c04107c5e55224b4517a43c5c40ba18a617d0?ds=sidebyside;hp=-c

Merge branch 'jl/daemon'

* jl/daemon:
Add virtualization support to git-daemon
---

043c04107c5e55224b4517a43c5c40ba18a617d0
diff --combined Makefile
index 739d7e3ccb,fb2ade5afb..4a8cd22602
--- a/Makefile
+++ b/Makefile
@@@ -246,7 -246,9 +246,9 @@@ DIFF_OBJS = 
  
  LIB_OBJS = \
  	blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \
- 	date.o diff-delta.o entry.o exec_cmd.o ident.o lockfile.o \
+ 	date.o diff-delta.o entry.o exec_cmd.o ident.o \
+ 	interpolate.o \
+ 	lockfile.o \
  	object.o pack-check.o patch-delta.o path.o pkt-line.o sideband.o \
  	quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \
  	server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
@@@ -254,7 -256,7 +256,7 @@@
  	fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
  	write_or_die.o trace.o list-objects.o \
  	alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) \
 -	color.o wt-status.o
 +	color.o wt-status.o archive-zip.o
  
  BUILTIN_OBJS = \
  	builtin-add.o \
@@@ -300,7 -302,8 +302,7 @@@
  	builtin-upload-archive.o \
  	builtin-upload-tar.o \
  	builtin-verify-pack.o \
 -	builtin-write-tree.o \
 -	builtin-zip-tree.o
 +	builtin-write-tree.o
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
  LIBS = $(GITLIBS) -lz