diff options
| author | Jeff King <peff@peff.net> | 2014-06-18 15:48:29 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-20 10:44:45 -0700 |
| commit | 95b567c7c3cf6b85d74b79424cdfbd40a7dee7c9 (patch) | |
| tree | e150b9f71b846bb3245577b55b9ba536bf5a6bfd /remote.c | |
| parent | ae021d87911da4328157273df24779892cb51277 (diff) | |
| download | git-95b567c7c3cf6b85d74b79424cdfbd40a7dee7c9.tar.gz | |
use skip_prefix to avoid repeating strings
It's a common idiom to match a prefix and then skip past it
with strlen, like:
if (starts_with(foo, "bar"))
foo += strlen("bar");
This avoids magic numbers, but means we have to repeat the
string (and there is no compiler check that we didn't make a
typo in one of the strings).
We can use skip_prefix to handle this case without repeating
ourselves.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.c')
| -rw-r--r-- | remote.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -488,9 +488,8 @@ static void read_config(void) current_branch = NULL; head_ref = resolve_ref_unsafe("HEAD", sha1, 0, &flag); if (head_ref && (flag & REF_ISSYMREF) && - starts_with(head_ref, "refs/heads/")) { - current_branch = - make_branch(head_ref + strlen("refs/heads/"), 0); + skip_prefix(head_ref, "refs/heads/", &head_ref)) { + current_branch = make_branch(head_ref, 0); } git_config(handle_config, NULL); if (branch_pushremote_name) { |