Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address forgotten "DROPME" #141

Merged
merged 1 commit into from
May 28, 2019
+13 −13
Merged

Address forgotten "DROPME" #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions wt-status.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,23 +753,23 @@ static int has_unmerged(struct wt_status *s)

void wt_status_collect(struct wt_status *s)
{
trace2_region_enter("status", "worktrees", the_repository);
trace2_region_enter("status", "worktrees", s->repo);
wt_status_collect_changes_worktree(s);
trace2_region_leave("status", "worktrees", the_repository);
trace2_region_leave("status", "worktrees", s->repo);

if (s->is_initial) {
trace2_region_enter("status", "initial", the_repository);
trace2_region_enter("status", "initial", s->repo);
wt_status_collect_changes_initial(s);
trace2_region_leave("status", "initial", the_repository);
trace2_region_leave("status", "initial", s->repo);
} else {
trace2_region_enter("status", "index", the_repository);
trace2_region_enter("status", "index", s->repo);
wt_status_collect_changes_index(s);
trace2_region_leave("status", "index", the_repository);
trace2_region_leave("status", "index", s->repo);
}

trace2_region_enter("status", "untracked", the_repository);
trace2_region_enter("status", "untracked", s->repo);
wt_status_collect_untracked(s);
trace2_region_leave("status", "untracked", the_repository);
trace2_region_leave("status", "untracked", s->repo);

wt_status_get_state(s->repo, &s->state, s->branch && !strcmp(s->branch, "HEAD"));
if (s->state.merge_in_progress && !has_unmerged(s))
Expand Down Expand Up @@ -2322,12 +2322,12 @@ static void wt_porcelain_v2_print(struct wt_status *s)

void wt_status_print(struct wt_status *s)
{
trace2_data_intmax("status", the_repository, "count/changed", s->change.nr);
trace2_data_intmax("status", the_repository, "count/untracked",
trace2_data_intmax("status", s->repo, "count/changed", s->change.nr);
trace2_data_intmax("status", s->repo, "count/untracked",
s->untracked.nr);
trace2_data_intmax("status", the_repository, "count/ignored", s->ignored.nr);
trace2_data_intmax("status", s->repo, "count/ignored", s->ignored.nr);

trace2_region_enter("status", "print", the_repository);
trace2_region_enter("status", "print", s->repo);

switch (s->status_format) {
case STATUS_FORMAT_SHORT:
Expand All @@ -2351,7 +2351,7 @@ void wt_status_print(struct wt_status *s)
break;
}

trace2_region_leave("status", "print", the_repository);
trace2_region_leave("status", "print", s->repo);
}

/**
Expand Down