From: René Scharfe Date: Tue, 4 Feb 2020 21:16:10 +0000 (+0100) Subject: name-rev: respect const qualifier X-Git-Tag: v2.26.0-rc0~45^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=36d2419c9a1b38f6883318f2af9b704d5d78356f;p=thirdparty%2Fgit.git name-rev: respect const qualifier Keep the const qualifier of the first parameter of get_rev_name() even when casting the object pointer to a commit pointer, and further for the parameter of get_commit_rev_name(), as all these uses are read-only. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano --- diff --git a/builtin/name-rev.c b/builtin/name-rev.c index a8de9cc561..2e6820bd5b 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -32,7 +32,7 @@ static struct commit_rev_name rev_names; /* How many generations are maximally preferred over _one_ merge traversal? */ #define MERGE_TRAVERSAL_WEIGHT 65535 -static struct rev_name *get_commit_rev_name(struct commit *commit) +static struct rev_name *get_commit_rev_name(const struct commit *commit) { struct rev_name **slot = commit_rev_name_peek(&rev_names, commit); @@ -357,11 +357,11 @@ static const char *get_exact_ref_match(const struct object *o) static const char *get_rev_name(const struct object *o, struct strbuf *buf) { struct rev_name *n; - struct commit *c; + const struct commit *c; if (o->type != OBJ_COMMIT) return get_exact_ref_match(o); - c = (struct commit *) o; + c = (const struct commit *) o; n = get_commit_rev_name(c); if (!n) return NULL;