From 5134ccde642ae9ed6a244c92864c26734d100f4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Wed, 27 Dec 2017 17:18:38 +0700 Subject: wt-status.c: rename rename-related fields in wt_status_change_data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These field "head_path" is used for rename display only. In the next patch we introduce another rename pair where the rename source is no longer HEAD. Rename it to something more generic. While at there, rename "score" as well and store the rename diff code in a separate field instead of hardcoding key[0] (i.e. diff-index) in porcelain v2 code. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- wt-status.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wt-status.h') diff --git a/wt-status.h b/wt-status.h index 8a3864783b..e87ee2de65 100644 --- a/wt-status.h +++ b/wt-status.h @@ -38,10 +38,11 @@ struct wt_status_change_data { int worktree_status; int index_status; int stagemask; - int score; int mode_head, mode_index, mode_worktree; struct object_id oid_head, oid_index; - char *head_path; + int rename_status; + int rename_score; + char *rename_source; unsigned dirty_submodule : 2; unsigned new_submodule_commits : 1; }; -- cgit v1.2.3