diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
|---|---|---|
| committer | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
| commit | ff08e56cde739152a59a86f5aa996954a2ec0614 (patch) | |
| tree | 9c7bc94151c5a082377ecb438e66aea140924edb /builtin/log.c | |
| parent | 2f899857a9f425cb59f8a15c2ea7a52100c51a23 (diff) | |
| parent | 4f01e5080c4a7eee69da47c958888358e6127584 (diff) | |
Merge branch 'bc/object-id' into base
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index d81a09051e..ba9d4cd786 100644 --- 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); |