pack-objects.c in rugged-0.27.9

- old
+ new

@@ -1093,11 +1093,11 @@
 	for (i = 0; i < window; ++i) {
 		git__free(array[i].index);
 		git__free(array[i].data);
 	}
 	git__free(array);
-	git_buf_dispose(&zbuf);
+	git_buf_free(&zbuf);
 
 	return error;
 }
 
 #ifdef GIT_THREADS
@@ -1461,11 +1461,11 @@
 	if (!(error = git_tree_lookup(&tree, pb->repo, oid)) &&
 	    !(error = git_packbuilder_insert(pb, oid, NULL)))
 		error = git_tree_walk(tree, GIT_TREEWALK_PRE, cb_tree_walk, &context);
 
 	git_tree_free(tree);
-	git_buf_dispose(&context.buf);
+	git_buf_free(&context.buf);
 	return error;
 }
 
 int git_packbuilder_insert_recur(git_packbuilder *pb, const git_oid *id, const char *name)
 {
@@ -1664,10 +1664,10 @@
 			if (error < 0)
 				return error;
 
 			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;
 			name = git_tree_entry_name(entry);
 			if ((error = git_packbuilder_insert(pb, entry_id, name)) < 0)