author | Jeff King <peff@peff.net> | |
Fri, 18 Nov 2011 11:13:08 +0000 (06:13 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 18 Nov 2011 19:55:58 +0000 (11:55 -0800) | ||
commit | 73b7eae60c18036eab21a84e42bfa8b5297fe679 | |
tree | 6aa3fd7d4591f15fb4def0d2f71ada7a7898336e | tree | snapshot |
parent | 4bd4e73093eb741a87b7d80bc84469d880f4e2f3 | commit | diff |
refresh_index: make porcelain output more specific
If you have a deleted file and a porcelain refreshes the
cache, we print:
Unstaged changes after reset:
M file
This is technically correct, in that the file is modified,
but it's friendlier to the user if we further differentiate
the case of a deleted file (especially because this output
looks a lot like "diff --name-status", which would also make
the distinction).
Similarly, we can distinguish typechanges ("T") and
intent-to-add files ("A"), both of which appear as just "M"
in the current output.
The plumbing output for all cases remains "needs update" for
historical compatibility.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If you have a deleted file and a porcelain refreshes the
cache, we print:
Unstaged changes after reset:
M file
This is technically correct, in that the file is modified,
but it's friendlier to the user if we further differentiate
the case of a deleted file (especially because this output
looks a lot like "diff --name-status", which would also make
the distinction).
Similarly, we can distinguish typechanges ("T") and
intent-to-add files ("A"), both of which appear as just "M"
in the current output.
The plumbing output for all cases remains "needs update" for
historical compatibility.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
read-cache.c | diff | blob | history |