diff options
| -rw-r--r-- | builtin/describe.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 72b2e1162c..04df89d56b 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -313,9 +313,9 @@ static void append_suffix(int depth, const struct object_id *oid, struct strbuf repo_find_unique_abbrev(the_repository, oid, abbrev)); } -static void describe_commit(struct object_id *oid, struct strbuf *dst) +static void describe_commit(struct commit *cmit, struct strbuf *dst) { - struct commit *cmit, *gave_up_on = NULL; + struct commit *gave_up_on = NULL; struct commit_list *list; struct commit_name *n; struct possible_tag all_matches[MAX_TAGS]; @@ -323,8 +323,6 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) unsigned long seen_commits = 0; unsigned int unannotated_cnt = 0; - cmit = lookup_commit_reference(the_repository, oid); - n = find_commit_name(&cmit->object.oid); if (n && (tags || all || n->prio == 2)) { /* @@ -332,7 +330,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) */ append_name(n, dst); if (n->misnamed || longformat) - append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst); + append_suffix(0, n->tag ? get_tagged_oid(n->tag) : &cmit->object.oid, dst); if (suffix) strbuf_addstr(dst, suffix); return; @@ -489,7 +487,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst) } struct process_commit_data { - struct object_id current_commit; + struct commit *current_commit; const struct object_id *looking_for; struct strbuf *dst; struct rev_info *revs; @@ -498,7 +496,7 @@ struct process_commit_data { static void process_commit(struct commit *commit, void *data) { struct process_commit_data *pcd = data; - pcd->current_commit = commit->object.oid; + pcd->current_commit = commit; } static void process_object(struct object *obj, const char *path, void *data) @@ -507,8 +505,8 @@ static void process_object(struct object *obj, const char *path, void *data) if (oideq(pcd->looking_for, &obj->oid) && !pcd->dst->len) { reset_revision_walk(); - if (!is_null_oid(&pcd->current_commit)) { - describe_commit(&pcd->current_commit, pcd->dst); + if (pcd->current_commit) { + describe_commit(pcd->current_commit, pcd->dst); strbuf_addf(pcd->dst, ":%s", path); } free_commit_list(pcd->revs->commits); @@ -521,7 +519,7 @@ static void describe_blob(const struct object_id *oid, struct strbuf *dst) struct rev_info revs; struct strvec args = STRVEC_INIT; struct object_id head_oid; - struct process_commit_data pcd = { *null_oid(the_hash_algo), oid, dst, &revs}; + struct process_commit_data pcd = { NULL, oid, dst, &revs}; if (repo_get_oid(the_repository, "HEAD", &head_oid)) die(_("cannot search for blob '%s' on an unborn branch"), @@ -562,7 +560,7 @@ static void describe(const char *arg, int last_one) cmit = lookup_commit_reference_gently(the_repository, &oid, 1); if (cmit) - describe_commit(&oid, &sb); + describe_commit(cmit, &sb); else if (odb_read_object_info(the_repository->objects, &oid, NULL) == OBJ_BLOB) describe_blob(&oid, &sb); |