pack-bitmap: convert traverse_bitmap_commit_list to object_id

diff --git a/builtin/log.c b/builtin/log.c
index 25c0808409abce661d89896ceef490f15bb0b57e..ba9d4cd7863b54ec02c62b73220883a8fca3a33f 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -975,7 +975,7 @@ static char *find_branch_name(struct rev_info *rev)
                return NULL;
        ref = rev->cmdline.rev[positive].name;
        tip_oid = &rev->cmdline.rev[positive].item->oid;
-       if (dwim_ref(ref, strlen(ref), branch_oid.hash, &full_ref) &&
+       if (dwim_ref(ref, strlen(ref), &branch_oid, &full_ref) &&
            skip_prefix(full_ref, "refs/heads/", &v) &&
            !oidcmp(tip_oid, &branch_oid))
                branch = xstrdup(v);
@@ -1660,10 +1660,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
                        check_head = 1;
 
                if (check_head) {
-                       struct object_id oid;
                        const char *ref, *v;
                        ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
-                                                oid.hash, NULL);
+                                                NULL, NULL);
                        if (ref && skip_prefix(ref, "refs/heads/", &v))
                                branch_name = xstrdup(v);
                        else
@@ -1759,7 +1758,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
        rev.add_signoff = do_signoff;
 
        if (show_progress)
-               progress = start_progress_delay(_("Generating patches"), total, 0, 2);
+               progress = start_delayed_progress(_("Generating patches"), total);
        while (0 <= --nr) {
                int shown;
                display_progress(progress, total - nr);