[PATCH 28/40] pack-objects: don't pack objects in external odbs

From: Christian Couder <christian.couder@gmail.com>
Date: Jan 3, 2018, 16:33 UTC
Message-ID: <20180103163403.11303-29-chriscool@tuxfamily.org>
In-Reply-To: <20180103163403.11303-1-chriscool@tuxfamily.org>

Objects managed by an external ODB should not be put into pack files. They should be transfered using other mechanism that can be specific to the external odb.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 builtin/pack-objects.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 6c71552cdf..4ed66c7677 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -28,6 +28,7 @@
 #include "argv-array.h"
 #include "mru.h"
 #include "packfile.h"
+#include "external-odb.h"
 
 static const char *pack_usage[] = {
 	N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
@@ -1026,6 +1027,9 @@ static int want_object_in_pack(const struct object_id *oid,
 			return want;
 	}
 
+	if (external_odb_has_object(oid->hash))
+		return 0;
+
 	for (entry = packed_git_mru.head; entry; entry = entry->next) {
 		struct packed_git *p = entry->item;
 		off_t offset;

-- 
2.16.0.rc0.16.g82191dbc6c.dirty