diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-12-27 11:18:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 21:38:35 +0100 |
| commit | 5134ccde642ae9ed6a244c92864c26734d100f4c (patch) | |
| tree | cacd116618cf1b1b809e4a6d55bbefb69f38e36e /wt-status.h | |
| parent | wt-status.c: catch unhandled diff status codes (diff) | |
| download | git-5134ccde642ae9ed6a244c92864c26734d100f4c.tar.xz git-5134ccde642ae9ed6a244c92864c26734d100f4c.zip | |
wt-status.c: rename rename-related fields in wt_status_change_data
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>
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 5 |
1 files changed, 3 insertions, 2 deletions
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; }; |