From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, peff@peff.net, pclouds@gmail.com,
Ramsay Jones <ramsay@ramsayjones.plus.com>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 14/21] Inline resolve_ref_1() into resolve_ref_unsafe()
Date: Wed, 23 Mar 2016 11:04:31 +0100 [thread overview]
Message-ID: <53338941ec04ba49db1fe6aa117f605d4d2a98f9.1458723959.git.mhagger@alum.mit.edu> (raw)
In-Reply-To: <cover.1458723959.git.mhagger@alum.mit.edu>
resolve_ref_unsafe() wasn't doing anything useful anymore.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs/files-backend.c | 31 +++++++++----------------------
1 file changed, 9 insertions(+), 22 deletions(-)
diff --git a/refs/files-backend.c b/refs/files-backend.c
index f752568..120b2dd 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1539,14 +1539,16 @@ out:
}
/* This function needs to return a meaningful errno on failure */
-static const char *resolve_ref_1(const char *refname,
- int resolve_flags,
- unsigned char *sha1,
- int *flags,
- struct strbuf *sb_refname)
+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
+ unsigned char *sha1, int *flags)
{
+ static struct strbuf sb_refname = STRBUF_INIT;
+ int unused_flags;
int symref_count;
+ if (!flags)
+ flags = &unused_flags;
+
*flags = 0;
if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
@@ -1570,7 +1572,7 @@ static const char *resolve_ref_1(const char *refname,
for (symref_count = 0; symref_count < MAXDEPTH; symref_count++) {
int read_flags = 0;
- if (read_raw_ref(refname, sha1, sb_refname, &read_flags)) {
+ if (read_raw_ref(refname, sha1, &sb_refname, &read_flags)) {
*flags |= read_flags;
if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
return NULL;
@@ -1590,7 +1592,7 @@ static const char *resolve_ref_1(const char *refname,
return refname;
}
- refname = sb_refname->buf;
+ refname = sb_refname.buf;
if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
hashclr(sha1);
return refname;
@@ -1610,21 +1612,6 @@ static const char *resolve_ref_1(const char *refname,
return NULL;
}
-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags)
-{
- static struct strbuf sb_refname = STRBUF_INIT;
- int unused_flags;
- const char *ret;
-
- if (!flags)
- flags = &unused_flags;
-
- ret = resolve_ref_1(refname, resolve_flags, sha1, flags,
- &sb_refname);
- return ret;
-}
-
/*
* Peel the entry (if possible) and return its new peel_status. If
* repeel is true, re-peel the entry even if there is an old peeled
--
2.8.0.rc3
next prev parent reply other threads:[~2016-03-23 10:13 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-23 10:04 [PATCH 00/21] replacement for dt/refs-backend-lmdb v7 patch 04/33 Michael Haggerty
2016-03-23 10:04 ` [PATCH 01/21] t1430: test the output and error of some commands more carefully Michael Haggerty
2016-03-23 10:04 ` [PATCH 02/21] t1430: clean up broken refs/tags/shadow Michael Haggerty
2016-03-23 10:04 ` [PATCH 03/21] t1430: don't rely on symbolic-ref for creating broken symrefs Michael Haggerty
2016-03-23 10:04 ` [PATCH 04/21] t1430: test for-each-ref in the presence of badly-named refs Michael Haggerty
2016-03-23 10:04 ` [PATCH 05/21] t1430: improve test coverage of deletion " Michael Haggerty
2016-03-23 10:04 ` [PATCH 06/21] resolve_missing_loose_ref(): simplify semantics Michael Haggerty
2016-03-23 10:04 ` [PATCH 07/21] resolve_ref_unsafe(): use for loop to count up to MAXDEPTH Michael Haggerty
2016-03-23 10:04 ` [PATCH 08/21] resolve_ref_unsafe(): ensure flags is always set Michael Haggerty
2016-03-23 10:04 ` [PATCH 09/21] resolve_ref_1(): eliminate local variable Michael Haggerty
2016-03-23 10:04 ` [PATCH 10/21] resolve_ref_1(): reorder code Michael Haggerty
2016-03-23 10:04 ` [PATCH 11/21] resolve_ref_1(): eliminate local variable "bad_name" Michael Haggerty
2016-03-23 10:04 ` [PATCH 12/21] files-backend: break out ref reading Michael Haggerty
2016-03-23 10:04 ` [PATCH 13/21] read_raw_ref(): manage own scratch space Michael Haggerty
2016-03-23 10:04 ` Michael Haggerty [this message]
2016-03-23 10:04 ` [PATCH 15/21] read_raw_ref(): change flags parameter to unsigned int Michael Haggerty
2016-03-23 10:04 ` [PATCH 16/21] fsck_head_link(): remove unneeded flag variable Michael Haggerty
2016-03-23 10:04 ` [PATCH 17/21] cmd_merge(): " Michael Haggerty
2016-03-23 10:04 ` [PATCH 18/21] get_default_remote(): " Michael Haggerty
2016-03-23 10:04 ` [PATCH 19/21] checkout_paths(): " Michael Haggerty
2016-03-23 10:04 ` [PATCH 20/21] check_aliased_update(): check that dst_name is non-NULL Michael Haggerty
2016-03-23 10:04 ` [PATCH 21/21] show_head_ref(): check the result of resolve_ref_namespace() Michael Haggerty
2016-03-24 6:47 ` [PATCH 00/21] replacement for dt/refs-backend-lmdb v7 patch 04/33 David Turner
2016-03-27 5:22 ` Michael Haggerty
2016-03-29 20:12 ` David Turner
2016-03-30 6:37 ` Michael Haggerty
2016-03-30 20:05 ` David Turner
2016-03-31 16:14 ` Michael Haggerty
2016-03-31 22:22 ` David Turner
2016-04-01 1:37 ` Stefan Beller
2016-04-01 17:55 ` David Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53338941ec04ba49db1fe6aa117f605d4d2a98f9.1458723959.git.mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).