summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-01-23 21:16:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-23 21:16:28 (GMT)
commitbc3dca07f435ed2ca5a974cdb0508f66cf442412 (patch)
tree14640aaf67159cab0a0d85cb6753c5f9d4dbfd53 /diff.c
parentfac64e011f1b1ecabcccf7ad2511efcac3e26bdc (diff)
parent176ea747930908669200520ae14f9dbc61cf0d40 (diff)
downloadgit-bc3dca07f435ed2ca5a974cdb0508f66cf442412.zip
git-bc3dca07f435ed2ca5a974cdb0508f66cf442412.tar.gz
git-bc3dca07f435ed2ca5a974cdb0508f66cf442412.tar.bz2
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
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index fb22b19..db4696f 100644
--- a/diff.c
+++ b/diff.c
@@ -246,7 +246,7 @@ static int parse_ws_error_highlight(const char *arg)
*/
void init_diff_ui_defaults(void)
{
- diff_detect_rename_default = 1;
+ diff_detect_rename_default = DIFF_DETECT_RENAME;
}
int git_diff_heuristic_config(const char *var, const char *value, void *cb)