files-backend: inline resolve_ref_1() into resolve_ref_unsafe()
resolve_ref_unsafe() wasn't doing anything useful anymore. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Apr 7, 2016 at 15:03 UTC
8c346fb1d791f388b307d1832aebc577477ed6fe
1 file changed
+9
-22
refs/files-backend.c
+9
-22
@@ -1539,14 +1539,16 @@ out:
1539
}
1540
1541
/* This function needs to return a meaningful errno on failure */
1542
-static const char *resolve_ref_1(const char *refname,
1543
- int resolve_flags,
1544
- unsigned char *sha1,
1545
- int *flags,
1546
- struct strbuf *sb_refname)
1542
+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
1543
+ unsigned char *sha1, int *flags)
1544
{
1545
+ static struct strbuf sb_refname = STRBUF_INIT;
1546
+ int unused_flags;
1547
int symref_count;
1548
1549
+ if (!flags)
1550
+ flags = &unused_flags;
1551
+
1552
*flags = 0;
1553
1554
if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
@@ -1570,7 +1572,7 @@ static const char *resolve_ref_1(const char *refname,
1572
for (symref_count = 0; symref_count < MAXDEPTH; symref_count++) {
1573
int read_flags = 0;
1574
1573
- if (read_raw_ref(refname, sha1, sb_refname, &read_flags)) {
1575
+ if (read_raw_ref(refname, sha1, &sb_refname, &read_flags)) {
1576
*flags |= read_flags;
1577
if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
1578
return NULL;
@@ -1590,7 +1592,7 @@ static const char *resolve_ref_1(const char *refname,
1592
return refname;
1593
}
1594
1593
- refname = sb_refname->buf;
1595
+ refname = sb_refname.buf;
1596
if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
1597
hashclr(sha1);
1598
return refname;
@@ -1610,21 +1612,6 @@ static const char *resolve_ref_1(const char *refname,
1612
return NULL;
1613
}
1614
1613
-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
1614
- unsigned char *sha1, int *flags)
1615
-{
1616
- static struct strbuf sb_refname = STRBUF_INIT;
1617
- int unused_flags;
1618
- const char *ret;
1619
-
1620
- if (!flags)
1621
- flags = &unused_flags;
1622
-
1623
- ret = resolve_ref_1(refname, resolve_flags, sha1, flags,
1624
- &sb_refname);
1625
- return ret;
1626
-}
1627
-
1615
/*
1616
* Peel the entry (if possible) and return its new peel_status. If
1617
* repeel is true, re-peel the entry even if there is an old peeled