]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'nd/ita-wt-renames-in-status' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:39:34 +0000 (10:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:39:35 +0000 (10:39 -0800)
"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

1  2 
Documentation/git-status.txt
builtin/commit.c
diff.c
t/t2203-add-intent.sh
wt-status.c
wt-status.h

Simple merge
Simple merge
diff --cc diff.c
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge
diff --cc wt-status.h
Simple merge