diff --git a/wt-status.c b/wt-status.c
index 5567868008ce332d9e9ee42b586ab838bad228e6..a25632bc87867748016e32a4ba4652918c8705a3 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
unsigned char sha1[20];
const char *head;
unsigned char sha1[20];
const char *head;
+ memset(s, 0, sizeof(*s));
head = resolve_ref("HEAD", sha1, 0, NULL);
s->branch = head ? xstrdup(head) : NULL;
head = resolve_ref("HEAD", sha1, 0, NULL);
s->branch = head ? xstrdup(head) : NULL;
-
s->reference = "HEAD";
s->reference = "HEAD";
- s->amend = 0;
- s->verbose = 0;
- s->untracked = 0;
-
- s->commitable = 0;
- s->workdir_dirty = 0;
- s->workdir_untracked = 0;
}
static void wt_status_print_cached_header(const char *reference)
}
static void wt_status_print_cached_header(const char *reference)
wt_status_print_trailer();
}
wt_status_print_trailer();
}
+static void wt_read_cache(struct wt_status *s)
+{
+ discard_cache();
+ read_cache();
+}
+
void wt_status_print_initial(struct wt_status *s)
{
int i;
char buf[PATH_MAX];
void wt_status_print_initial(struct wt_status *s)
{
int i;
char buf[PATH_MAX];
- read_cache();
+ wt_read_cache(s);
if (active_nr) {
s->commitable = 1;
wt_status_print_cached_header(NULL);
if (active_nr) {
s->commitable = 1;
wt_status_print_cached_header(NULL);
rev.diffopt.format_callback = wt_status_print_updated_cb;
rev.diffopt.format_callback_data = s;
rev.diffopt.detect_rename = 1;
rev.diffopt.format_callback = wt_status_print_updated_cb;
rev.diffopt.format_callback_data = s;
rev.diffopt.detect_rename = 1;
+ wt_read_cache(s);
run_diff_index(&rev, 1);
}
run_diff_index(&rev, 1);
}
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = wt_status_print_changed_cb;
rev.diffopt.format_callback_data = s;
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = wt_status_print_changed_cb;
rev.diffopt.format_callback_data = s;
+ wt_read_cache(s);
run_diff_files(&rev, 0);
}
run_diff_files(&rev, 0);
}
setup_revisions(0, NULL, &rev, s->reference);
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
rev.diffopt.detect_rename = 1;
setup_revisions(0, NULL, &rev, s->reference);
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
rev.diffopt.detect_rename = 1;
+ wt_read_cache(s);
run_diff_index(&rev, 1);
}
run_diff_index(&rev, 1);
}
if (s->branch) {
const char *on_what = "On branch ";
const char *branch_name = s->branch;
if (s->branch) {
const char *on_what = "On branch ";
const char *branch_name = s->branch;
- if (!strncmp(branch_name, "refs/heads/", 11))
+ if (!prefixcmp(branch_name, "refs/heads/"))
branch_name += 11;
else if (!strcmp(branch_name, "HEAD")) {
branch_name = "";
branch_name += 11;
else if (!strcmp(branch_name, "HEAD")) {
branch_name = "";
}
else {
wt_status_print_updated(s);
}
else {
wt_status_print_updated(s);
- discard_cache();
}
wt_status_print_changed(s);
}
wt_status_print_changed(s);
wt_status_use_color = git_config_colorbool(k, v);
return 0;
}
wt_status_use_color = git_config_colorbool(k, v);
return 0;
}
- if (!strncmp(k, "status.color.", 13) || !strncmp(k, "color.status.", 13)) {
+ if (!prefixcmp(k, "status.color.") || !prefixcmp(k, "color.status.")) {
int slot = parse_status_slot(k, 13);
color_parse(v, k, wt_status_colors[slot]);
}
int slot = parse_status_slot(k, 13);
color_parse(v, k, wt_status_colors[slot]);
}