[PATCH 1/2] Suggest use of "git add file1 file2" when there is nothing to commit.
flat view
DORMANTno replies
From: Shawn O. Pearce <hidden>
Date: 2016-08-11 20:03:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
If a user modifies files and runs 'git commit' (without the very useful -a option) and they have not yet updated the index they are probably coming from another SCM-like tool which would perform the same as 'git commit -a' in this case. Showing the user their current status and a final line of "nothing to commit" is not very reassuring, as the user might believe that Git did not recognize their files were modified. Instead we can suggest as part of the 'nothing to commit' message that the user invoke 'git add' to add files to their next commit. Suggested by Andy Parkins' Git 'niggles' list ([ref]). Signed-off-by: Shawn O. Pearce <redacted> --- git-commit.sh | 2 +- wt-status.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/git-commit.sh b/git-commit.sh
index 05828bb..2672def 100755
--- a/git-commit.sh
+++ b/git-commit.sh@@ -515,7 +515,7 @@ then current="$(git-rev-parse --verify HEAD)" else if [ -z "$(git-ls-files)" ]; then - echo >&2 Nothing to commit + echo >&2 'nothing to commit (use "git add file1 file2" to include for commit)' exit 1 fi PARENTS=""
diff --git a/wt-status.c b/wt-status.c
index 6e9414d..2173d4f 100644
--- a/wt-status.c
+++ b/wt-status.c@@ -15,6 +15,7 @@ static char wt_status_colors[][COLOR_MAXLEN] = { "\033[31m", /* WT_STATUS_CHANGED: red */ "\033[31m", /* WT_STATUS_UNTRACKED: red */ }; +static const char* use_add_msg = "use \"git add file1 file2\" to include for commit"; static int parse_status_slot(const char *var, int offset) {
@@ -162,8 +163,7 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q, { int i; if (q->nr) - wt_status_print_header("Changed but not updated", - "use git-add on files to include for commit"); + wt_status_print_header("Changed but not updated", use_add_msg); for (i = 0; i < q->nr; i++) wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]); if (q->nr)
@@ -249,8 +249,7 @@ static void wt_status_print_untracked(const struct wt_status *s) continue; } if (!shown_header) { - wt_status_print_header("Untracked files", - "use \"git add\" to add to commit"); + wt_status_print_header("Untracked files", use_add_msg); shown_header = 1; } color_printf(color(WT_STATUS_HEADER), "#\t");
@@ -292,7 +291,9 @@ void wt_status_print(struct wt_status *s) if (s->verbose && !s->is_initial) wt_status_print_verbose(s); if (!s->commitable) - printf("%s\n", s->amend ? "# No changes" : "nothing to commit"); + printf("%s (%s)\n", + s->amend ? "# No changes" : "nothing to commit", + use_add_msg); } int git_status_config(const char *k, const char *v)
--
1.4.4.2.g053a