[PATCH 2/2 (v2)] reset: make the output more user-friendly.
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:47:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 2/2 (v2)] reset: make the output more user-friendly. · Matthieu Moy <hidden>
- 2016-06-15 · Re: [PATCH 2/2 (v2)] reset: make the output more user-friendly. · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 2/2 (v2)] reset: make the output more user-friendly. · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 2/2 (v2)] reset: make the output more user-friendly. · Matthieu Moy <hidden>
git reset without argument displays a summary of the remaining unstaged changes. The problem with these is that they look like an error message, and the format is inconsistant with the format used in other places like "git diff --name-status". This patch mimics the output of "git diff --name-status", and adds a header to make it clear the output is informative, and not an error. Signed-off-by: Matthieu Moy <redacted> --- As noted by Junio, my previous version did actually display the header unconditionnaly. This version displays it as the first change is found. read-cache.c | 22 +++++++++++++++++----- t/t7102-reset.sh | 3 ++- 2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index f1aff81..4a4f4a5 100644
--- a/read-cache.c
+++ b/read-cache.c@@ -1065,6 +1065,15 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate, return updated; } +static void show_file(const char * fmt, const char * name, int in_porcelain, int * first) +{ + if (in_porcelain && *first) { + printf("Unstaged changes after reset:\n"); + *first=0; + } + printf(fmt, name); +} + int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec, char *seen) { int i;
@@ -1074,11 +1083,14 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p int quiet = (flags & REFRESH_QUIET) != 0; int not_new = (flags & REFRESH_IGNORE_MISSING) != 0; int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0; + int first = 1; + int in_porcelain = (flags & REFRESH_IN_PORCELAIN); unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0; - const char *needs_update_message; + const char *needs_update_fmt; + const char *needs_merge_fmt; - needs_update_message = ((flags & REFRESH_IN_PORCELAIN) - ? "locally modified" : "needs update"); + needs_update_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n"); + needs_merge_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n"); for (i = 0; i < istate->cache_nr; i++) { struct cache_entry *ce, *new; int cache_errno = 0;
@@ -1094,7 +1106,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p i--; if (allow_unmerged) continue; - printf("%s: needs merge\n", ce->name); + show_file(needs_merge_fmt, ce->name, in_porcelain, &first); has_errors = 1; continue; }
@@ -1117,7 +1129,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, const char **p } if (quiet) continue; - printf("%s: %s\n", ce->name, needs_update_message); + show_file(needs_update_fmt, ce->name, in_porcelain, &first); has_errors = 1; continue; }
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index e637c7d..e85ff02 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh@@ -419,7 +419,8 @@ test_expect_success 'resetting an unmodified path is a no-op' ' ' cat > expect << EOF -file2: locally modified +Unstaged changes after reset: +M file2 EOF test_expect_success '--mixed refreshes the index' '
--
1.6.4.62.g39c83.dirty