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

Merge branch 'nd/ita-wt-renames-in-status'

Browse Source 
"git status" after moving a path in the working tree (hence making
it appear "removed") and then adding with the -N option (hence
making that appear "added") detected it as a rename, but did not
report the  old and new pathnames correctly.

* nd/ita-wt-renames-in-status:
  wt-status.c: handle worktree renames
  wt-status.c: rename rename-related fields in wt_status_change_data
  wt-status.c: catch unhandled diff status codes
  wt-status.c: coding style fix
  Use DIFF_DETECT_RENAME for detect_rename assignments
  t2203: test status output with porcelain v2 format
This commit is contained in:
Junio C Hamano
2018-01-23 13:16:28 -08:00
parent fac64e011f 176ea74793
commit bc3dca07f4
6 changed files with 143 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wt-status.h
View File

@@ -44,10 +44,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;
};