From 03feb2af494b3c8cacbcddb301a904c3751d678f Mon Sep 17 00:00:00 2001 From: Matthew Johnson Date: Fri, 1 Dec 2017 12:29:37 -0800 Subject: [PATCH] Do not attempt full file creation for ghosted files Signed-off-by: Matthew Johnson --- src/pack.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pack.c b/src/pack.c index 29c7758..0cdbae1 100644 --- a/src/pack.c +++ b/src/pack.c @@ -161,7 +161,11 @@ static void make_pack_full_files(struct packdata *pack) while (item) { file = item->data; item = g_list_next(item); - if ((!file->peer || file->peer->is_deleted) && !file->is_deleted && !file->rename_peer) { + /* only create full files if renames or deltas are not appropriate */ + if ((!file->peer || file->peer->is_deleted || file->peer->is_ghosted) && + !file->is_deleted && /* no full-files for deletes */ + !file->is_ghosted && /* no full-files for ghosts */ + !file->rename_peer) { /* no full-files for renames */ char *from, *to; char *fullfrom, *fullto;