Re: [PATCH 10/16] pack-objects: use bitmaps when packing objects
flat view
From: Thomas Rast <hidden>
Date: 2016-06-15 22:57:55
Vicent Marti [off-list ref] writes:
quoted hunk ↗ jump to hunk
diff --git a/Makefile b/Makefile index e03c773..0f2e72b 100644 --- a/Makefile +++ b/Makefile@@ -703,6 +703,7 @@ LIB_H += notes.h LIB_H += object.h LIB_H += pack-revindex.h LIB_H += pack.h +LIB_H += pack-bitmap.h LIB_H += parse-options.h LIB_H += patch-ids.h LIB_H += pathspec.h@@ -838,6 +839,7 @@ LIB_OBJS += notes.o LIB_OBJS += notes-cache.o LIB_OBJS += notes-merge.o LIB_OBJS += object.o +LIB_OBJS += pack-bitmap.o LIB_OBJS += pack-check.o LIB_OBJS += pack-revindex.o LIB_OBJS += pack-write.o
What does this apply on? When starting with the series from
origin/master, git-am fails, and 'git am -3' tells me I don't have the
necessary blobs (from the 'index' line above).
Not that it's super hard to fix this up as long as it's in the Makefile
only, but still.
--
Thomas Rast
trast@{inf,student}.ethz.ch