[RFC/PATCH v4 22/49] pack-objects: don't pack objects in external odbs
STALE3304d
From: Christian Couder <hidden>
Date: 2017-06-20 07:57:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v4 of 3 in this series.
Revisions (3)
- v4 current
- v5 [diff vs current]
- v6 [diff vs current]
Objects managed by an external ODB should not be put into pack files. Signed-off-by: Christian Couder <redacted> --- builtin/pack-objects.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index f672225def..e423f685ff 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c@@ -24,6 +24,7 @@ #include "sha1-array.h" #include "argv-array.h" #include "mru.h" +#include "external-odb.h" static const char *pack_usage[] = { N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
@@ -1011,6 +1012,9 @@ static int want_object_in_pack(const unsigned char *sha1, return want; } + if (external_odb_has_object(sha1)) + return 0; + for (entry = packed_git_mru->head; entry; entry = entry->next) { struct packed_git *p = entry->item; off_t offset;
--
2.13.1.565.gbfcd7a9048