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

wt-status.c: rename rename-related fields in wt_status_change_data

Browse Source 
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 <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2017-12-27 17:18:38 +07:00
committed by Junio C Hamano
parent ea56f97749
commit 5134ccde64
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wt-status.h
View File

@@ -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;
};