[PATCH 2/4] refresh_index: mark deletions in porcelain output
flat view
DORMANTno replies
From: Jeff King <hidden>
Date: 2016-06-15 22:52:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
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). The plumbing version stays as "needs update" for historical compatibility. Signed-off-by: Jeff King <redacted> --- read-cache.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index eb3aae3..046cf7e 100644
--- a/read-cache.c
+++ b/read-cache.c@@ -1103,9 +1103,11 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p int in_porcelain = (flags & REFRESH_IN_PORCELAIN); unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0; const char *modified_fmt; + const char *deleted_fmt; const char *unmerged_fmt; modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n"); + deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n"); unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n"); for (i = 0; i < istate->cache_nr; i++) { struct cache_entry *ce, *new;
@@ -1145,7 +1147,9 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p } if (quiet) continue; - show_file(modified_fmt, ce->name, in_porcelain, &first, header_msg); + show_file((cache_errno == ENOENT ? deleted_fmt : + modified_fmt), + ce->name, in_porcelain, &first, header_msg); has_errors = 1; continue; }
--
1.7.7.3.8.g38efa