diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-12-12 18:20:32 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 09:39:46 -0800 |
| commit | 8cad4744ee37ebec1d9491a1381ec1771a1ba795 (patch) | |
| tree | 064bbe938f38727dd163aae9c95e2185b8075234 /builtin/log.c | |
| parent | 96ec7b1e708863d0cd6b8e72a986d6f0a1bb64db (diff) | |
| download | git-8cad4744ee37ebec1d9491a1381ec1771a1ba795.tar.gz git-8cad4744ee37ebec1d9491a1381ec1771a1ba795.tar.xz | |
Rename resolve_ref() to resolve_ref_unsafe()
resolve_ref() may return a pointer to a shared buffer and can be
overwritten by the next resolve_ref() calls. Callers need to
pay attention, not to keep the pointer when the next call happens.
Rename with "_unsafe" suffix to warn developers (or reviewers) before
introducing new call sites.
This patch is generated using the following command
git grep -l 'resolve_ref(' -- '*.[ch]'|xargs sed -i 's/resolve_ref(/resolve_ref_unsafe(/g'
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 4395f3e47..89d0cc013 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1040,7 +1040,7 @@ static char *find_branch_name(struct rev_info *rev) if (positive < 0) return NULL; strbuf_addf(&buf, "refs/heads/%s", rev->cmdline.rev[positive].name); - branch = resolve_ref(buf.buf, branch_sha1, 1, NULL); + branch = resolve_ref_unsafe(buf.buf, branch_sha1, 1, NULL); if (!branch || prefixcmp(branch, "refs/heads/") || hashcmp(rev->cmdline.rev[positive].item->sha1, branch_sha1)) @@ -1268,7 +1268,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) rev.pending.objects[0].item->flags |= UNINTERESTING; add_head_to_pending(&rev); - ref = resolve_ref("HEAD", sha1, 1, NULL); + ref = resolve_ref_unsafe("HEAD", sha1, 1, NULL); if (ref && !prefixcmp(ref, "refs/heads/")) branch_name = xstrdup(ref + strlen("refs/heads/")); else |