From 1211be6bed1146dcef953c7c2ab332ee995f7152 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 17 Aug 2007 09:56:54 -0700 Subject: Make thin-pack generation subproject aware. When a thin pack wants to send a tree object at "sub/dir", and the commit that is common between the sender and the receiver that is used as the base object has a subproject at that path, we should not try to use the data at "sub/dir" of the base tree as a tree object. It is not a tree to begin with, and more importantly, the commit object there does not have to even exist. Signed-off-by: Junio C Hamano --- builtin-pack-objects.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin-pack-objects.c') diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 24926db27a..77481df5d6 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -979,6 +979,8 @@ static void add_pbase_object(struct tree_desc *tree, int cmp; while (tree_entry(tree,&entry)) { + if (S_ISGITLINK(entry.mode)) + continue; cmp = tree_entry_len(entry.path, entry.sha1) != cmplen ? 1 : memcmp(name, entry.path, cmplen); if (cmp > 0) -- cgit v1.3-5-g9baa