diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-11-13 17:22:14 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-13 12:21:06 -0800 |
| commit | c6893323917cbf4cb66c29ba2ac03014a44f0f0c (patch) | |
| tree | cc14f88d5ebfd114e5c80f74506eff6c9a5fa68b /builtin/merge.c | |
| parent | bc1bbe0c19a6ff39522b4fa3259f34150e308e1f (diff) | |
| download | git-c6893323917cbf4cb66c29ba2ac03014a44f0f0c.tar.gz git-c6893323917cbf4cb66c29ba2ac03014a44f0f0c.tar.xz | |
Convert many resolve_ref() calls to read_ref*() and ref_exists()
resolve_ref() may return a pointer to a static buffer, which is not
safe for long-term use because if another resolve_ref() call happens,
the buffer may be changed. Many call sites though do not care about
this buffer. They simply check if the return value is NULL or not.
Convert all these call sites to new wrappers to reduce resolve_ref()
calls from 57 to 34. If we change resolve_ref() prototype later on
to avoid passing static buffer out, this helps reduce changes.
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/merge.c')
| -rw-r--r-- | builtin/merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index dffd5ec12..42b4f9e7b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -420,7 +420,7 @@ static struct object *want_commit(const char *name) static void merge_name(const char *remote, struct strbuf *msg) { struct object *remote_head; - unsigned char branch_head[20], buf_sha[20]; + unsigned char branch_head[20]; struct strbuf buf = STRBUF_INIT; struct strbuf bname = STRBUF_INIT; const char *ptr; @@ -479,7 +479,7 @@ static void merge_name(const char *remote, struct strbuf *msg) strbuf_addstr(&truname, "refs/heads/"); strbuf_addstr(&truname, remote); strbuf_setlen(&truname, truname.len - len); - if (resolve_ref(truname.buf, buf_sha, 1, NULL)) { + if (ref_exists(truname.buf)) { strbuf_addf(msg, "%s\t\tbranch '%s'%s of .\n", sha1_to_hex(remote_head->sha1), |