upload-pack: simplify request validation

diff --git a/Makefile b/Makefile
index 029bf39c9adecb9b5cd69b770a4daaf423ac6a5c..1b30d7bde301305cde0d3af74c7e478e36bd673b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -766,7 +766,7 @@ LIB_OBJS += log-tree.o
 LIB_OBJS += mailmap.o
 LIB_OBJS += match-trees.o
 LIB_OBJS += merge.o
-LIB_OBJS += merge-file.o
+LIB_OBJS += merge-blobs.o
 LIB_OBJS += merge-recursive.o
 LIB_OBJS += mergesort.o
 LIB_OBJS += name-hash.o