Merge with gitk.

diff --git a/Makefile b/Makefile
index 7b97be65f9feb82f39bfab0860daec080e7e14a2..5efb6268a1311099cb131f05feef81453011bf7e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@
 # Define NO_OPENSSL environment variable if you do not have OpenSSL. You will
 # miss out git-rev-list --merge-order. This also implies MOZILLA_SHA1.
 #
+# Define NO_CURL if you do not have curl installed.  git-http-pull is not
+# built, and you cannot use http:// and https:// transports.
+#
 # Define PPC_SHA1 environment variable when running make to make use of
 # a bundled SHA1 routine optimized for PowerPC.
 
@@ -29,13 +32,14 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION=0.99.2
+GIT_VERSION=0.99.3
 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)
 
 prefix=$(HOME)
 bindir=$(prefix)/bin
+template_dir=$(prefix)/share/git-core/templates/
 # dest=
 
 CC?=gcc
@@ -62,14 +66,18 @@ 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-request-pull-script git-bisect-script
+
+SCRIPTS += git-count-objects-script
+# SCRIPTS += git-send-email-script
+SCRIPTS += git-revert-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-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
+       git-ssh-push git-ssh-pull git-rev-list git-mktag \
        git-diff-helper git-tar-tree git-local-pull git-hash-object \
        git-get-tar-commit-id git-apply git-stripspace \
        git-diff-stages git-rev-parse git-patch-id git-pack-objects \
@@ -78,16 +86,24 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-show-index git-daemon git-var git-peek-remote \
        git-update-server-info git-show-rev-cache git-build-rev-cache
 
+ifndef NO_CURL
+PROG+= git-http-pull
+endif
+
 LIB_FILE=libgit.a
 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
 
@@ -138,6 +154,8 @@ CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
 
 all: $(PROG)
 
+all:
+       $(MAKE) -C templates
 
 .PRECIOUS: %.o
 git-%: %.o $(LIB_FILE)
@@ -151,7 +169,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)
@@ -183,6 +205,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
@@ -223,3 +246,5 @@ clean:
        rm -f git-core-*.tar.gz git-core.spec
        $(MAKE) -C tools/ clean
        $(MAKE) -C Documentation/ clean
+       $(MAKE) -C templates/ clean
+       $(MAKE) -C t/ clean