mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/more-uses-of-skip-prefix'

Browse Source 
* rs/more-uses-of-skip-prefix:
  use skip_prefix() to avoid more magic numbers
This commit is contained in:
Junio C Hamano
2014-10-14 10:50:07 -07:00
parent 63434da0b4 e3f1da982e
commit 145c590df8
10 changed files with 69 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/commit.c
View File

@ -1295,6 +1295,7 @@ static int parse_status_slot(const char *var, int offset)
static int git_status_config(const char *k, const char *v, void *cb)
{
struct wt_status *s = cb;
const char *slot_name;
if (starts_with(k, "column."))
return git_column_config(k, v, "status", &s->colopts);
@ -1324,8 +1325,9 @@ static int git_status_config(const char *k, const char *v, void *cb)
s->display_comment_prefix = git_config_bool(k, v);
return 0;
}
if (starts_with(k, "status.color.") || starts_with(k, "color.status.")) {
int slot = parse_status_slot(k, 13);
if (skip_prefix(k, "status.color.", &slot_name) ||
skip_prefix(k, "color.status.", &slot_name)) {
int slot = parse_status_slot(k, slot_name - k);
if (slot < 0)
return 0;
if (!v)
@ -1514,13 +1516,11 @@ static void print_summary(const char *prefix, const unsigned char *sha1,
diff_setup_done(&rev.diffopt);
head = resolve_ref_unsafe("HEAD", junk_sha1, 0, NULL);
printf("[%s%s ",
starts_with(head, "refs/heads/") ?
head + 11 :
!strcmp(head, "HEAD") ?
_("detached HEAD") :
head,
initial_commit ? _(" (root-commit)") : "");
if (!strcmp(head, "HEAD"))
head = _("detached HEAD");
else
skip_prefix(head, "refs/heads/", &head);
printf("[%s%s ", head, initial_commit ? _(" (root-commit)") : "");
if (!log_tree_commit(&rev, commit)) {
rev.always_show_header = 1;