Remove unnecessary git-rm --cached reference from status output

Since git-reset has learned restoring the absence of paths git-rm --cached is
no longer necessary. Therefore remove it from the cached content header hint.

Also remove the unfortunate wording 'Cached' from the header itself.

Signed-off-by: Jürgen Rühle <j-r@online.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/wt-status.c b/wt-status.c
index 8aac526440bc31e0ade55c77e6b2b6120b5132ee..c48127daca9b96ce43a86508705dbaa4c24059be 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -56,9 +56,9 @@ void wt_status_prepare(struct wt_status *s)
 static void wt_status_print_cached_header(const char *reference)
 {
        const char *c = color(WT_STATUS_HEADER);
 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:");
+       color_printf_ln(c, "# Changes to be committed:");

        if (reference) {
        if (reference) {

-               color_printf_ln(c, "#   (use \"git reset %s <file>...\" and \"git rm --cached <file>...\" to unstage)", reference);
+               color_printf_ln(c, "#   (use \"git reset %s <file>...\" to unstage)", reference);

        } else {
                color_printf_ln(c, "#   (use \"git rm --cached <file>...\" to unstage)");
        }
        } else {
                color_printf_ln(c, "#   (use \"git rm --cached <file>...\" to unstage)");
        }