Use diff_tree() directly in making cover letter

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 5a22f49eadf37e8024564c19a3dd60d00fea3901..1bba6e6a64220ef2121ce8817ccae123739f4e8e 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1429,8 +1429,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
         * accounting lock.  Compiler will optimize the strangeness
         * away when THREADED_DELTA_SEARCH is not defined.
         */
-       if (trg_entry->delta_data)
-               free(trg_entry->delta_data);
+       free(trg_entry->delta_data);
        cache_lock();
        if (trg_entry->delta_data) {
                delta_cache_size -= trg_entry->delta_size;
@@ -2239,9 +2238,6 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 #ifdef THREADED_DELTA_SEARCH
        if (!delta_search_threads)      /* --threads=0 means autodetect */
                delta_search_threads = online_cpus();
-       if (progress)
-               fprintf(stderr, "Using %d pack threads.\n",
-                       delta_search_threads);
 #endif
 
        prepare_packed_git();