status: make "how to stage" messages optional

These messages are nice for new users, but experienced git
users know how to manipulate the index, and these messages
waste a lot of screen real estate.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index a35b9181bc811dcf63489532023d7d4ebfbd75f4..8cbabe8012bbd8519592bcdfdc32d9dbb7e1ad03 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -122,6 +122,10 @@ advice.*::
        pushNonFastForward::
                Advice shown when linkgit:git-push[1] refuses
                non-fast-forward refs. Default: true.
        pushNonFastForward::
                Advice shown when linkgit:git-push[1] refuses
                non-fast-forward refs. Default: true.

+       statusHints::
+               Directions on how to stage/unstage/add shown in the
+               output of linkgit:git-status[1] and the template shown
+               when writing commit messages. Default: true.

 --
 
 core.fileMode::
 --
 
 core.fileMode::

diff --git a/advice.c b/advice.c
index b5216a2456f3f1d4e1d0bf582e3a735672217e35..ae4b1e81dfea0f63db10691ba0005c8888fd6dc7 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -1,12 +1,14 @@
 #include "cache.h"
 
 int advice_push_nonfastforward = 1;
 #include "cache.h"
 
 int advice_push_nonfastforward = 1;

+int advice_status_hints = 1;

 
 static struct {
        const char *name;
        int *preference;
 } advice_config[] = {
        { "pushnonfastforward", &advice_push_nonfastforward },
 
 static struct {
        const char *name;
        int *preference;
 } advice_config[] = {
        { "pushnonfastforward", &advice_push_nonfastforward },

+       { "statushints", &advice_status_hints },

 };
 
 int git_default_advice_config(const char *var, const char *value)
 };
 
 int git_default_advice_config(const char *var, const char *value)

diff --git a/advice.h b/advice.h
index 862bae37b811b08ccb0fda2449a1c61d5d37f7a1..e9df8e026c301767b12217ba0374860a15742f2e 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -2,6 +2,7 @@
 #define ADVICE_H
 
 extern int advice_push_nonfastforward;
 #define ADVICE_H
 
 extern int advice_push_nonfastforward;

+extern int advice_status_hints;

 
 int git_default_advice_config(const char *var, const char *value);
 
 
 int git_default_advice_config(const char *var, const char *value);
 

diff --git a/wt-status.c b/wt-status.c
index 85f3fcb8a2f55b362268e00c5bb67434e38382b0..38eb24536b34e40af4c43eb1631e08624e8993d6 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -48,6 +48,8 @@ static void wt_status_print_unmerged_header(struct wt_status *s)
 {
        const char *c = color(WT_STATUS_HEADER, s);
        color_fprintf_ln(s->fp, c, "# Unmerged paths:");
 {
        const char *c = color(WT_STATUS_HEADER, s);
        color_fprintf_ln(s->fp, c, "# Unmerged paths:");

+       if (!advice_status_hints)
+               return;

        if (!s->is_initial)
                color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
        else
        if (!s->is_initial)
                color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
        else


@@ -60,6 +62,8 @@ static void wt_status_print_cached_header(struct wt_status *s)
 {
        const char *c = color(WT_STATUS_HEADER, s);
        color_fprintf_ln(s->fp, c, "# Changes to be committed:");
 {
        const char *c = color(WT_STATUS_HEADER, s);
        color_fprintf_ln(s->fp, c, "# Changes to be committed:");

+       if (!advice_status_hints)
+               return;

        if (!s->is_initial) {
                color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
        } else {
        if (!s->is_initial) {
                color_fprintf_ln(s->fp, c, "#   (use \"git reset %s <file>...\" to unstage)", s->reference);
        } else {


@@ -73,6 +77,8 @@ static void wt_status_print_dirty_header(struct wt_status *s,
 {
        const char *c = color(WT_STATUS_HEADER, s);
        color_fprintf_ln(s->fp, c, "# Changed but not updated:");
 {
        const char *c = color(WT_STATUS_HEADER, s);
        color_fprintf_ln(s->fp, c, "# Changed but not updated:");

+       if (!advice_status_hints)
+               return;

        if (!has_deleted)
                color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to update what will be committed)");
        else
        if (!has_deleted)
                color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to update what will be committed)");
        else


@@ -85,6 +91,8 @@ static void wt_status_print_untracked_header(struct wt_status *s)
 {
        const char *c = color(WT_STATUS_HEADER, s);
        color_fprintf_ln(s->fp, c, "# Untracked files:");
 {
        const char *c = color(WT_STATUS_HEADER, s);
        color_fprintf_ln(s->fp, c, "# Untracked files:");

+       if (!advice_status_hints)
+               return;

        color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to include in what will be committed)");
        color_fprintf_ln(s->fp, c, "#");
 }
        color_fprintf_ln(s->fp, c, "#   (use \"git add <file>...\" to include in what will be committed)");
        color_fprintf_ln(s->fp, c, "#");
 }