| commit | bc3dca07f435ed2ca5a974cdb0508f66cf442412 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Jan 2018 21:16:28 +0000 (23 13:16 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Jan 2018 21:16:28 +0000 (23 13:16 -0800) | ||
| tree | 14640aaf67159cab0a0d85cb6753c5f9d4dbfd53 | treesnapshot (tar.gz zip) |
| parent | fac64e011f1b1ecabcccf7ad2511efcac3e26bdc | commitdiff |
| parent | 176ea747930908669200520ae14f9dbc61cf0d40 | commitdiff |
Merge branch 'nd/ita-wt-renames-in-status'
"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
"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