[PATCH v2 4/7] wt-status.c: rename wt_status_change_data::score
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Dec 26, 2017, 09:10 UTC
- Message-ID
- <20171226091012.24315-5-pclouds@gmail.com>
- In-Reply-To
- <20171226091012.24315-1-pclouds@gmail.com>
We are about to adding support for "diff-files" rename, which has its own rename score in addition to the "diff-index" one. Rename score to head_score to indicate this score comes from diff-index. The new score will be named worktree_score.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- wt-status.c | 4 ++-- wt-status.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/wt-status.c b/wt-status.c index db06fc7c85..0f089c5789 100644 --- a/wt-status.c +++ b/wt-status.c @@ -532,7 +532,7 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q, case DIFF_STATUS_COPIED: case DIFF_STATUS_RENAMED: d->head_path = xstrdup(p->one->path); - d->score = p->score * 100 / MAX_SCORE; + d->head_score = p->score * 100 / MAX_SCORE; /* fallthru */ case DIFF_STATUS_MODIFIED: case DIFF_STATUS_TYPE_CHANGED: @@ -2074,7 +2074,7 @@ static void wt_porcelain_v2_print_changed_entry( key, submodule_token, d->mode_head, d->mode_index, d->mode_worktree, oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index), - key[0], d->score, + key[0], d->head_score, path_index, sep_char, path_head, eol_char); else fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c", diff --git a/wt-status.h b/wt-status.h index fe27b465e2..f9330982ac 100644 --- a/wt-status.h +++ b/wt-status.h @@ -44,7 +44,7 @@ struct wt_status_change_data { int worktree_status; int index_status; int stagemask; - int score; + int head_score; int mode_head, mode_index, mode_worktree; struct object_id oid_head, oid_index; char *head_path;
-- 2.15.0.320.g0453912d77