summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Borum <anders@algoritmer.dk>2018-09-27 11:18:00 +0200
committerPatrick Steinhardt <ps@pks.im>2018-10-26 14:58:51 +0200
commite91d6b5ef927b29585879763af46ec986ea756da (patch)
tree6e9174953d06228d08cd9ff2608095a57c35f9eb
parentb69089fd2aefecb028be2a067b4dda5fa906c0b6 (diff)
downloadlibgit2-e91d6b5ef927b29585879763af46ec986ea756da.tar.gz
fix check if blob is uninteresting when inserting tree to packbuilder
Blobs that have been marked as uninteresting should not be inserted into packbuilder when inserting a tree. The check as to whether a blob was uninteresting looked at the status for the tree itself instead of the blob. This could cause significantly larger packfiles. (cherry picked from commit b36cc7a4013a47856dade4226edc657906b82431)
-rw-r--r--src/pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pack-objects.c b/src/pack-objects.c
index e9245143c..355b9e1e0 100644
--- a/src/pack-objects.c
+++ b/src/pack-objects.c
@@ -1666,7 +1666,7 @@ int insert_tree(git_packbuilder *pb, git_tree *tree)
break;
case GIT_OBJ_BLOB:
- if ((error = retrieve_object(&obj, pb, git_tree_id(tree))) < 0)
+ if ((error = retrieve_object(&obj, pb, entry_id)) < 0)
return error;
if (obj->uninteresting)
continue;