Re: [PATCH 2/4] Improve cached content header of status output
From: Andy Whitcroft <hidden>
Date: 2016-06-15 22:42:47
Juergen Ruehle wrote:
quoted hunk ↗ jump to hunk
From: =?iso-8859-1?q?J=FCrgen_R=FChle?= <redacted> This tries to be more to the point while also including a pointer on how to unstage changes from the index. Since this header is printed in two different code paths and the name of the reference commit is needed for the unstage part, provide a new printing function. Signed-off-by: Jürgen Rühle <redacted> --- wt-status.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-)diff --git a/wt-status.c b/wt-status.c index 34be91b..98ca135 100644 --- a/wt-status.c +++ b/wt-status.c@@ -53,6 +53,18 @@ void wt_status_prepare(struct wt_status *s) s->untracked = 0; } +static void wt_status_print_cached_header(const char *reference) +{ + const char *c = color(WT_STATUS_HEADER); + color_printf_ln(c, "# Cached changes to be committed:"); + if (reference) { + color_printf_ln(c, "# (use \"git reset %s <file>...\" and \"git rm --cached <file>...\" to unstage)", reference); + } else { + color_printf_ln(c, "# (use \"git rm --cached <file>...\" to unstage)"); + } + color_printf_ln(c, "#");
We seem to be using 'Cached' and 'staged' here. I thought we had
updated all the docs to call files in the index "Staged for commit". It
feels like the header should be more like:
# Currently staged changes, will be commited:
The rm --cached is somewhat unfortunate either way.
-apw