Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'

diff --git a/builtin/log.c b/builtin/log.c
index f3d5a02bea5fb3847c65afb78860bf171a7f3036..6c1fa896ad01a8de0dcd99be80827d436d2cc857 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -974,7 +974,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);