Merge with master.

diff --git a/Makefile b/Makefile
index db52a852f6c7911ebcacaf77bee4ff6f4106b92c..e574f44faf4003664596fbef2ff7859b5e10865b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,13 +32,14 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION=0.99.2
+GIT_VERSION=0.99.4
 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)
 
 prefix=$(HOME)
 bindir=$(prefix)/bin
+template_dir=$(prefix)/share/git-core/templates/
 # dest=
 
 CC?=gcc
@@ -65,12 +66,15 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-format-patch-script git-sh-setup-script git-push-script \
        git-branch-script git-parse-remote git-verify-tag-script \
        git-ls-remote-script git-clone-dumb-http git-rename-script \
-       git-request-pull-script git-bisect-script git-fetch-dumb-http
+       git-request-pull-script git-bisect-script
+
+SCRIPTS += git-count-objects-script
+SCRIPTS += git-send-email-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
        git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
-       git-check-files git-ls-tree git-merge-base git-merge-cache \
+       git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-ssh-push git-ssh-pull git-rev-list git-mktag \
        git-diff-helper git-tar-tree git-local-pull git-hash-object \
@@ -79,8 +83,7 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
        git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
        git-show-index git-daemon git-var git-peek-remote \
-       git-update-server-info git-show-rev-cache git-build-rev-cache \
-       git-missing-revs
+       git-update-server-info git-show-rev-cache git-build-rev-cache
 
 ifndef NO_CURL
 PROG+= git-http-pull
@@ -91,11 +94,15 @@ LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h
        pack.h pkt-line.h refs.h
 LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
         tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
-        refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o
+        refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
+        sha1_name.o
 
 LIB_H += rev-cache.h
 LIB_OBJS += rev-cache.o
 
+LIB_H += run-command.h
+LIB_OBJS += run-command.o
+
 LIB_H += strbuf.h
 LIB_OBJS += strbuf.o
 
@@ -146,8 +153,12 @@ CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
 
 all: $(PROG)
 
+all:
+       $(MAKE) -C templates
 
-.PRECIOUS: %.o
+.SECONDARY: %.o
+.c.o:
+       $(CC) $(CFLAGS) -o $*.o -c $*.c
 git-%: %.o $(LIB_FILE)
        $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
@@ -159,7 +170,11 @@ git-ssh-push: rsh.o
 git-http-pull: LIBS += -lcurl
 git-rev-list: LIBS += $(OPENSSL_LIBSSL)
 
+init-db.o: init-db.c
+       $(CC) -c $(CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
+
 $(LIB_OBJS): $(LIB_H)
+$(patsubst git-%,%.o,$(PROG)): $(LIB_H)
 $(DIFF_OBJS): diffcore.h
 
 $(LIB_FILE): $(LIB_OBJS)
@@ -191,6 +206,7 @@ check:
 install: $(PROG) $(SCRIPTS)
        $(INSTALL) -m755 -d $(dest)$(bindir)
        $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
+       $(MAKE) -C templates install
 
 install-tools:
        $(MAKE) -C tools install
@@ -218,16 +234,18 @@ dist: git-core.spec git-tar-tree
 rpm: dist
        $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
 
-
-backup: clean
-       cd .. ; tar czvf dircache.tar.gz dir-cache
-
-
+deb: dist
+       rm -rf $(GIT_TARNAME)
+       tar zxf $(GIT_TARNAME).tar.gz
+       cd $(GIT_TARNAME) && fakeroot debian/rules binary
 
 ### Cleaning rules
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
-       rm -f git-core-*.tar.gz git-core.spec
+       rm -f $(GIT_TARNAME).tar.gz git-core.spec git-core_$(GIT_VERSION)-*.deb
+       rm -rf $(GIT_TARNAME)
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
+       $(MAKE) -C templates/ clean
+       $(MAKE) -C t/ clean