Abstract out the "name <email> date" handling of commit-tree.c

diff --git a/Makefile b/Makefile
index 03ea1636a77abd66813553d21d6b2b2a004a6ef4..779fbbbfc90baf2a01d0cc87ee48873e9b9d2bb0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-log-script git-shortlog git-cvsimport-script git-diff-script \
        git-reset-script git-add-script git-checkout-script git-clone-script \
        gitk git-cherry git-rebase-script git-relink-script git-repack-script \
-       git-format-patch-script git-sh-setup-script git-push-script
+       git-format-patch-script git-sh-setup-script git-push-script \
+       git-branch-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 \
@@ -57,7 +58,7 @@ install: $(PROG) $(SCRIPTS)
 
 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 \
-        epoch.o refs.o csum-file.o pack-check.o pkt-line.o connect.o
+        epoch.o refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o
 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
@@ -171,26 +172,27 @@ diffcore-break.o : $(LIB_H) diffcore.h
 diffcore-order.o : $(LIB_H) diffcore.h
 epoch.o: $(LIB_H)
 
-git.spec: git.spec.in
+git-core.spec: git-core.spec.in
        sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
 
-GIT_TARNAME=git-$(GIT_VERSION)
-dist: git.spec git-tar-tree
+GIT_TARNAME=git-core-$(GIT_VERSION)
+dist: git-core.spec git-tar-tree
        ./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
        @mkdir -p $(GIT_TARNAME)
-       @cp git.spec $(GIT_TARNAME)
-       tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git.spec
+       @cp git-core.spec $(GIT_TARNAME)
+       tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec
        @rm -rf $(GIT_TARNAME)
        gzip -9 $(GIT_TARNAME).tar
 
 rpm: dist
-       rpmbuild -ta git-$(GIT_VERSION).tar.gz
+       rpmbuild -ta git-core-$(GIT_VERSION).tar.gz
 
 test: all
        $(MAKE) -C t/ all
 
 clean:
        rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
+       rm -f git-core-*.tar.gz git-core.spec
        $(MAKE) -C Documentation/ clean
 
 backup: clean