mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 08:56:25 +02:00
Code

show-branch: use skip_prefix to drop magic numbers 

We make several starts_with() calls, only to advance
pointers. This is exactly what skip_prefix() is for, which
lets us avoid manually-counted magic numbers.

Helped-by: Pranit Bauva <pranit.bauva@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2017-02-15 16:40:52 -05:00 committed by Junio C Hamano
parent d9e557a320
commit d3cc5f4c44
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/show-branch.c
View File

@ -275,8 +275,7 @@ static void show_one_commit(struct commit *commit, int no_name)
pp_commit_easy(CMIT_FMT_ONELINE, commit, &pretty);
pretty_str = pretty.buf;
}
if (starts_with(pretty_str, "[PATCH] "))
pretty_str += 8;
skip_prefix(pretty_str, "[PATCH] ", &pretty_str);
if (!no_name) {
if (name && name->head_name) {
@ -470,17 +469,14 @@ static void snarf_refs(int head, int remotes)
}
}
static int rev_is_head(char *head, char *name,
static int rev_is_head(const char *head, const char *name,
unsigned char *head_sha1, unsigned char *sha1)
{
if (!head || (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
return 0;
if (starts_with(head, "refs/heads/"))
head += 11;
if (starts_with(name, "refs/heads/"))
name += 11;
else if (starts_with(name, "heads/"))
name += 6;
skip_prefix(head, "refs/heads/", &head);
if (!skip_prefix(name, "refs/heads/", &name))
skip_prefix(name, "heads/", &name);
return !strcmp(head, name);
}
@ -799,8 +795,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
has_head++;
}
if (!has_head) {
int offset = starts_with(head, "refs/heads/") ? 11 : 0;
append_one_rev(head + offset);
const char *name = head;
skip_prefix(name, "refs/heads/", &name);
append_one_rev(name);
}
}