summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-17 20:53:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-17 20:53:55 (GMT)
commitf3504ea3dd21b0a6d38bcd369efa0663cdc05416 (patch)
treec8eb1191474dc37e25f082917e803915525c15d1 /Makefile
parentfba9654364a523bf146df26052ab05dd52c1d719 (diff)
parentfe0ac2fb7f8e87d37ef83dcee2d93901d58d8277 (diff)
downloadgit-f3504ea3dd21b0a6d38bcd369efa0663cdc05416.zip
git-f3504ea3dd21b0a6d38bcd369efa0663cdc05416.tar.gz
git-f3504ea3dd21b0a6d38bcd369efa0663cdc05416.tar.bz2
Merge branch 'cc/delta-islands'
Lift code from GitHub to restrict delta computation so that an object that exists in one fork is not made into a delta against another object that does not appear in the same forked repository. * cc/delta-islands: pack-objects: move 'layer' into 'struct packing_data' pack-objects: move tree_depth into 'struct packing_data' t5320: tests for delta islands repack: add delta-islands support pack-objects: add delta-islands support pack-objects: refactor code into compute_layer_order() Add delta-islands.{c,h}
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d6cd9a5..7cf6820 100644
--- a/Makefile
+++ b/Makefile
@@ -850,6 +850,7 @@ LIB_OBJS += csum-file.o
LIB_OBJS += ctype.o
LIB_OBJS += date.o
LIB_OBJS += decorate.o
+LIB_OBJS += delta-islands.o
LIB_OBJS += diffcore-break.o
LIB_OBJS += diffcore-delta.o
LIB_OBJS += diffcore-order.o