[PATCH] Switch implementations of merge-base, port to parsing

diff --git a/Makefile b/Makefile
index b04c0d8a9c28c6b1108bcf866d0210b99025175a..0c3ba2eb8bda000f1062414de093dd9aa7a240d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,8 +64,8 @@ check-files: check-files.o read-cache.o
 ls-tree: ls-tree.o read-cache.o
        $(CC) $(CFLAGS) -o ls-tree ls-tree.o read-cache.o $(LIBS)
 
-merge-base: merge-base.o read-cache.o
-       $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o $(LIBS)
+merge-base: merge-base.o read-cache.o object.o commit.o tree.o blob.o
+       $(CC) $(CFLAGS) -o merge-base merge-base.o read-cache.o object.o commit.o tree.o blob.o $(LIBS)
 
 read-cache.o: cache.h
 show-diff.o: cache.h