Re: [PATCH] fetch: use skip_prefix() instead of starts_with()
From: Jeff King <hidden>
Date: 2019-11-26 16:09:37
On Tue, Nov 26, 2019 at 12:18:26PM +0100, René Scharfe wrote:
quoted hunk ↗ jump to hunk
diff --git a/builtin/fetch.c b/builtin/fetch.c index 863c858fde..02e8619618 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c@@ -954,18 +954,12 @@ static int store_updated_refs(const char *raw_url, const char *remote_name, kind = ""; what = ""; } - else if (starts_with(rm->name, "refs/heads/")) { + else if (skip_prefix(rm->name, "refs/heads/", &what)) kind = "branch"; - what = rm->name + 11; - } - else if (starts_with(rm->name, "refs/tags/")) { + else if (skip_prefix(rm->name, "refs/tags/", &what)) kind = "tag"; - what = rm->name + 10; - } - else if (starts_with(rm->name, "refs/remotes/")) { + else if (skip_prefix(rm->name, "refs/remotes/", &what)) kind = "remote-tracking branch"; - what = rm->name + 13; - } else {
Yep, this one looks obviously correct. We were already mutating "what", so this just does it inside skip_prefix(). Much nicer. -Peff