diff options
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sha1_name.c b/sha1_name.c index 26a5811..15854e3 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -1126,6 +1126,7 @@ static int interpret_upstream_mark(const char *name, int namelen, int interpret_branch_name(const char *name, int namelen, struct strbuf *buf) { char *at; + const char *start; int len = interpret_nth_prior_checkout(name, namelen, buf); if (!namelen) @@ -1140,17 +1141,18 @@ int interpret_branch_name(const char *name, int namelen, struct strbuf *buf) return reinterpret(name, namelen, len, buf); } - at = memchr(name, '@', namelen); - if (!at) - return -1; + for (start = name; + (at = memchr(start, '@', namelen - (start - name))); + start = at + 1) { - len = interpret_empty_at(name, namelen, at - name, buf); - if (len > 0) - return reinterpret(name, namelen, len, buf); + len = interpret_empty_at(name, namelen, at - name, buf); + if (len > 0) + return reinterpret(name, namelen, len, buf); - len = interpret_upstream_mark(name, namelen, at - name, buf); - if (len > 0) - return len; + len = interpret_upstream_mark(name, namelen, at - name, buf); + if (len > 0) + return len; + } return -1; } |