[PATCH] Handle deltified object correctly in git-*-pull family.

diff --git a/Makefile b/Makefile
index ba75d6732a9d57d735c07a6198910060f64e5928..a5e7552e10bf50888814d43b1ba1a7276d130ca6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,10 @@ CC=gcc
 AR=ar
 INSTALL=install
 
-SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \
+SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-pull-script git-tag-script git-resolve-script git-whatchanged \
-       git-deltafy-script git-fetch-script git-status-script git-commit-script
+       git-deltafy-script git-fetch-script git-status-script git-commit-script \
+       git-log-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 \
@@ -48,7 +49,7 @@ LIB_OBJS += strbuf.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
+       count-delta.o diffcore-break.o diffcore-order.o
 
 LIB_OBJS += gitenv.o
 
@@ -132,6 +133,7 @@ diffcore-rename.o : $(LIB_H) diffcore.h
 diffcore-pathspec.o : $(LIB_H) diffcore.h
 diffcore-pickaxe.o : $(LIB_H) diffcore.h
 diffcore-break.o : $(LIB_H) diffcore.h
+diffcore-order.o : $(LIB_H) diffcore.h
 
 test: all
        $(MAKE) -C t/ all