summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2007-08-17 16:56:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-19 18:44:47 (GMT)
commit1211be6bed1146dcef953c7c2ab332ee995f7152 (patch)
tree38e28b3c3a9c93b6fa47b2f53f88171629d23051 /builtin-pack-objects.c
parent95064cbcc8a51fb9e3c16350e8c567a84d131ad7 (diff)
downloadgit-1211be6bed1146dcef953c7c2ab332ee995f7152.zip
git-1211be6bed1146dcef953c7c2ab332ee995f7152.tar.gz
git-1211be6bed1146dcef953c7c2ab332ee995f7152.tar.bz2
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 <gitster@pobox.com>
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 24926db..77481df 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)