diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:39:34 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:39:35 -0800 |
commit | 12accdc023f2b62109860cb745bdd1827b2c22de (patch) | |
tree | 4265b3ff5332cebf9bc36ae9b21749e696098629 /archive.c | |
parent | Git 2.16.2 (diff) | |
parent | wt-status.c: handle worktree renames (diff) | |
download | tgif-12accdc023f2b62109860cb745bdd1827b2c22de.tar.xz |
Merge branch 'nd/ita-wt-renames-in-status' into maint
"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 'archive.c')
0 files changed, 0 insertions, 0 deletions