[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.

diff --git a/Makefile b/Makefile
index 233d24afad66ae4ec2d7ffb33408a57199013e64..bf3cd8d73092c27dfa0db6ca1d1efc2e0db32b63 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,8 @@
 # BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
 # break unless your underlying filesystem supports those sub-second times
 # (my ext3 doesn't).
+GIT_VERSION=0.99.1
+
 COPTS=-O2
 CFLAGS=-g $(COPTS) -Wall
 
@@ -19,6 +21,7 @@ bin=$(prefix)/bin
 CC=gcc
 AR=ar
 INSTALL=install
+RPMBUILD=rpmbuild
 
 #
 # sparse is architecture-neutral, which means that we need to tell it
@@ -31,7 +34,9 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-fetch-script git-status-script git-commit-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
+       gitk git-cherry git-rebase-script git-relink-script git-repack-script \
+       git-format-patch-script git-sh-setup-script git-push-script \
+       git-branch-script git-parse-remote
 
 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 \
@@ -39,20 +44,22 @@ PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-check-files 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-diff-helper git-tar-tree git-local-pull git-write-blob \
+       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 \
        git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
-       git-prune-packed git-fetch-pack git-upload-pack
+       git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
+       git-show-index git-daemon git-var
 
 all: $(PROG)
 
 install: $(PROG) $(SCRIPTS)
+       $(INSTALL) -m755 -d $(dest)$(bin)
        $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bin)
 
 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 \
-        epoch.o refs.o csum-file.o pack-check.o pkt-line.o connect.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 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
@@ -60,6 +67,9 @@ LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h
 LIB_H += strbuf.h
 LIB_OBJS += strbuf.o
 
+LIB_H += quote.h
+LIB_OBJS += quote.o 
+
 LIB_H += diff.h count-delta.h
 LIB_OBJS += diff.o diffcore-rename.o diffcore-pickaxe.o diffcore-pathspec.o \
        count-delta.o diffcore-break.o diffcore-order.o
@@ -127,7 +137,7 @@ git-rev-list: rev-list.c
 git-mktag: mktag.c
 git-diff-helper: diff-helper.c
 git-tar-tree: tar-tree.c
-git-write-blob: write-blob.c
+git-hash-object: hash-object.c
 git-stripspace: stripspace.c
 git-diff-stages: diff-stages.c
 git-rev-parse: rev-parse.c
@@ -139,6 +149,7 @@ git-receive-pack: receive-pack.c
 git-send-pack: send-pack.c
 git-prune-packed: prune-packed.c
 git-fetch-pack: fetch-pack.c
+git-var: var.c
 
 git-http-pull: LIBS += -lcurl
 git-rev-list: LIBS += -lssl
@@ -163,11 +174,33 @@ diffcore-break.o : $(LIB_H) diffcore.h
 diffcore-order.o : $(LIB_H) diffcore.h
 epoch.o: $(LIB_H)
 
+git-core.spec: git-core.spec.in Makefile
+       sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
+
+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-core.spec $(GIT_TARNAME)
+       tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec
+       @rm -rf $(GIT_TARNAME)
+       gzip -f -9 $(GIT_TARNAME).tar
+
+rpm: dist
+       $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
+
 test: all
        $(MAKE) -C t/ all
 
+doc:
+       $(MAKE) -C Documentation all
+
+install-doc:
+       $(MAKE) -C Documentation install
+
 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