It's more efficient to check for the braces first, and we already have
the length of the whole thing.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
sha1_name.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/sha1_name.c b/sha1_name.c
index e27db88..1a68103 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -417,7 +417,7 @@ static int ambiguous_path(const char *path, int len)
static inline int upstream_mark(const char *string, int len)
{
- const char *suffix[] = { "@{upstream}", "@{u}" };
+ const char *suffix[] = { "upstream", "u" };
int i;
for (i = 0; i < ARRAY_SIZE(suffix); i++) {
@@ -475,7 +475,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
nth_prior = 1;
continue;
}
- if (!upstream_mark(str + at, len - at)) {
+ if (!upstream_mark(str + at + 2, len - at - 3)) {
reflog_len = (len-1) - (at+2);
len = at;
}
@@ -1074,7 +1074,6 @@ int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
char *cp;
struct branch *branch;
int len = interpret_nth_prior_checkout(name, buf);
- int tmp_len;
if (!namelen)
namelen = strlen(name);
@@ -1096,11 +1095,13 @@ int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
if (len > 0)
return reinterpret(name, namelen, len, buf);
- tmp_len = upstream_mark(cp, namelen - (cp - name));
- if (!tmp_len)
+ len = namelen - (cp - name);
+ if (cp[1] != '{' && cp[len - 1] != '}')
+ return -1;
+
+ if (!upstream_mark(cp + 2, len - 3))
return -1;
- len = cp + tmp_len - name;
cp = xstrndup(name, cp - name);
branch = branch_get(*cp ? cp : NULL);
/*
@@ -1125,7 +1126,7 @@ int interpret_branch_name(const char *name, int namelen, struct strbuf *buf)
strbuf_reset(buf);
strbuf_addstr(buf, cp);
free(cp);
- return len;
+ return namelen;
}
int strbuf_branchname(struct strbuf *sb, const char *name)
--
1.8.5.1+fc1.2.gebd1fb1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html