Merge branch 'jk/misc-uninitialized-fixes'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:30 +0000 (13:19 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Sep 2019 04:19:30 +0000 (13:19 +0900)
Various fixes to codepaths gcc 9 had trouble following dataflow.

* jk/misc-uninitialized-fixes:
pack-objects: drop packlist index_pos optimization
test-read-cache: drop namelen variable
diff-delta: set size out-parameter to 0 for NULL delta
bulk-checkin: zero-initialize hashfile_checkpoint
pack-objects: use object_id in packlist_alloc()
git-am: handle missing "author" when parsing commit

1  2 
builtin/pack-objects.c
pack-bitmap.c
diff --combined builtin/pack-objects.c
index c8f51bc65c3621d945ad4a11d9c08929a5250862,9a8d935700de13b182b9e3f9946b205fee8ecec4..5876583220c7d15ace8f7d4fbc7a5c4cef7a8d3b
@@@ -610,12 -610,12 +610,12 @@@ static int mark_tagged(const char *path
                       void *cb_data)
  {
        struct object_id peeled;
-       struct object_entry *entry = packlist_find(&to_pack, oid, NULL);
+       struct object_entry *entry = packlist_find(&to_pack, oid);
  
        if (entry)
                entry->tagged = 1;
        if (!peel_ref(path, &peeled)) {
-               entry = packlist_find(&to_pack, &peeled, NULL);
+               entry = packlist_find(&to_pack, &peeled);
                if (entry)
                        entry->tagged = 1;
        }
@@@ -996,12 -996,11 +996,11 @@@ static int no_try_delta(const char *pat
   * few lines later when we want to add the new entry.
   */
  static int have_duplicate_entry(const struct object_id *oid,
-                               int exclude,
-                               uint32_t *index_pos)
+                               int exclude)
  {
        struct object_entry *entry;
  
-       entry = packlist_find(&to_pack, oid, index_pos);
+       entry = packlist_find(&to_pack, oid);
        if (!entry)
                return 0;
  
@@@ -1141,13 -1140,12 +1140,12 @@@ static void create_object_entry(const s
                                uint32_t hash,
                                int exclude,
                                int no_try_delta,
-                               uint32_t index_pos,
                                struct packed_git *found_pack,
                                off_t found_offset)
  {
        struct object_entry *entry;
  
-       entry = packlist_alloc(&to_pack, oid->hash, index_pos);
+       entry = packlist_alloc(&to_pack, oid);
        entry->hash = hash;
        oe_set_type(entry, type);
        if (exclude)
@@@ -1171,11 -1169,10 +1169,10 @@@ static int add_object_entry(const struc
  {
        struct packed_git *found_pack = NULL;
        off_t found_offset = 0;
-       uint32_t index_pos;
  
        display_progress(progress_state, ++nr_seen);
  
-       if (have_duplicate_entry(oid, exclude, &index_pos))
+       if (have_duplicate_entry(oid, exclude))
                return 0;
  
        if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
  
        create_object_entry(oid, type, pack_name_hash(name),
                            exclude, name && no_try_delta(name),
-                           index_pos, found_pack, found_offset);
+                           found_pack, found_offset);
        return 1;
  }
  
@@@ -1199,17 -1196,15 +1196,15 @@@ static int add_object_entry_from_bitmap
                                        int flags, uint32_t name_hash,
                                        struct packed_git *pack, off_t offset)
  {
-       uint32_t index_pos;
        display_progress(progress_state, ++nr_seen);
  
-       if (have_duplicate_entry(oid, 0, &index_pos))
+       if (have_duplicate_entry(oid, 0))
                return 0;
  
        if (!want_object_in_pack(oid, 0, &pack, &offset))
                return 0;
  
-       create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset);
+       create_object_entry(oid, type, name_hash, 0, 0, pack, offset);
        return 1;
  }
  
@@@ -1507,7 -1502,7 +1502,7 @@@ static int can_reuse_delta(const unsign
         * First see if we're already sending the base (or it's explicitly in
         * our "excluded" list).
         */
-       base = packlist_find(&to_pack, &base_oid, NULL);
+       base = packlist_find(&to_pack, &base_oid);
        if (base) {
                if (!in_same_island(&delta->idx.oid, &base->idx.oid))
                        return 0;
@@@ -2342,6 -2337,15 +2337,6 @@@ static void find_deltas(struct object_e
        free(array);
  }
  
 -static void try_to_free_from_threads(size_t size)
 -{
 -      packing_data_lock(&to_pack);
 -      release_pack_memory(size);
 -      packing_data_unlock(&to_pack);
 -}
 -
 -static try_to_free_t old_try_to_free_routine;
 -
  /*
   * The main object list is split into smaller lists, each is handed to
   * one worker.
@@@ -2382,10 -2386,12 +2377,10 @@@ static void init_threaded_search(void
        pthread_mutex_init(&cache_mutex, NULL);
        pthread_mutex_init(&progress_mutex, NULL);
        pthread_cond_init(&progress_cond, NULL);
 -      old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
  }
  
  static void cleanup_threaded_search(void)
  {
 -      set_try_to_free_routine(old_try_to_free_routine);
        pthread_cond_destroy(&progress_cond);
        pthread_mutex_destroy(&cache_mutex);
        pthread_mutex_destroy(&progress_mutex);
@@@ -2568,7 -2574,7 +2563,7 @@@ static void add_tag_chain(const struct 
         * it was included via bitmaps, we would not have parsed it
         * previously).
         */
-       if (packlist_find(&to_pack, oid, NULL))
+       if (packlist_find(&to_pack, oid))
                return;
  
        tag = lookup_tag(the_repository, oid);
@@@ -2592,7 -2598,7 +2587,7 @@@ static int add_ref_tag(const char *path
  
        if (starts_with(path, "refs/tags/") && /* is a tag? */
            !peel_ref(path, &peeled)    && /* peelable? */
-           packlist_find(&to_pack, &peeled, NULL))      /* object packed? */
+           packlist_find(&to_pack, &peeled))      /* object packed? */
                add_tag_chain(oid);
        return 0;
  }
@@@ -2704,6 -2710,10 +2699,6 @@@ static int git_pack_config(const char *
                use_bitmap_index_default = git_config_bool(k, v);
                return 0;
        }
 -      if (!strcmp(k, "pack.usesparse")) {
 -              sparse = git_config_bool(k, v);
 -              return 0;
 -      }
        if (!strcmp(k, "pack.threads")) {
                delta_search_threads = git_config_int(k, v);
                if (delta_search_threads < 0)
@@@ -2788,7 -2798,7 +2783,7 @@@ static void show_object(struct object *
                for (p = strchr(name, '/'); p; p = strchr(p + 1, '/'))
                        depth++;
  
-               ent = packlist_find(&to_pack, &obj->oid, NULL);
+               ent = packlist_find(&to_pack, &obj->oid);
                if (ent && depth > oe_tree_depth(&to_pack, ent))
                        oe_set_tree_depth(&to_pack, ent, depth);
        }
@@@ -3019,7 -3029,7 +3014,7 @@@ static void loosen_unused_packed_object
  
                for (i = 0; i < p->num_objects; i++) {
                        nth_packed_object_oid(&oid, p, i);
-                       if (!packlist_find(&to_pack, &oid, NULL) &&
+                       if (!packlist_find(&to_pack, &oid) &&
                            !has_sha1_pack_kept_or_nonlocal(&oid) &&
                            !loosened_object_can_be_discarded(&oid, p->mtime))
                                if (force_object_loose(&oid, p->mtime))
@@@ -3328,10 -3338,6 +3323,10 @@@ int cmd_pack_objects(int argc, const ch
        read_replace_refs = 0;
  
        sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);
 +      prepare_repo_settings(the_repository);
 +      if (!sparse && the_repository->settings.pack_use_sparse != -1)
 +              sparse = the_repository->settings.pack_use_sparse;
 +
        reset_pack_idx_option(&pack_idx_opts);
        git_config(git_pack_config, NULL);
  
diff --combined pack-bitmap.c
index 30842e1e742e112ed920ebf8a51f54e9c139c13c,84cd1bed4a1f16efe18698ac92c6614cb91bf209..e07c798879b7277797b093a3eac6b4aece9ee4d2
@@@ -709,7 -709,9 +709,7 @@@ struct bitmap_index *prepare_bitmap_wal
                        else
                                object_list_insert(object, &wants);
  
 -                      if (!tag->tagged)
 -                              die("bad tag");
 -                      object = parse_object_or_die(&tag->tagged->oid, NULL);
 +                      object = parse_object_or_die(get_tagged_oid(tag), NULL);
                }
  
                if (object->flags & UNINTERESTING)
@@@ -1061,7 -1063,7 +1061,7 @@@ int rebuild_existing_bitmaps(struct bit
  
                entry = &bitmap_git->pack->revindex[i];
                nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr);
-               oe = packlist_find(mapping, &oid, NULL);
+               oe = packlist_find(mapping, &oid);
  
                if (oe)
                        reposition[i] = oe_in_pack_pos(mapping, oe) + 1;