From: Junio C Hamano Date: Tue, 23 Jan 2018 21:16:28 +0000 (-0800) Subject: Merge branch 'nd/ita-wt-renames-in-status' X-Git-Url: http://git.osdn.net/view?p=git-core%2Fgit.git;a=commitdiff_plain;h=bc3dca07f435ed2ca5a974cdb0508f66cf442412 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 --- bc3dca07f435ed2ca5a974cdb0508f66cf442412