Merge branch 'jk/pack-bitmap'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index fd741970e61c674c628f2e9c8ae48e08d4996961..c73337931b0c2d456801de75a4a17e83b2091753 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -769,8 +769,6 @@ static void write_pack_file(void)
                        f = create_tmp_packfile(&pack_tmp_name);
 
                offset = write_pack_header(f, nr_remaining);
-               if (!offset)
-                       die_errno("unable to write pack header");
 
                if (reuse_packfile) {
                        off_t packfile_size;
@@ -2089,7 +2087,7 @@ static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, vo
 {
        unsigned char peeled[20];
 
-       if (!prefixcmp(path, "refs/tags/") && /* is a tag? */
+       if (starts_with(path, "refs/tags/") && /* is a tag? */
            !peel_ref(path, peeled)        && /* peelable? */
            packlist_find(&to_pack, peeled, NULL))      /* object packed? */
                add_object_entry(sha1, OBJ_TAG, NULL, 0);