undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-status: wording update to deal with deleted files.

Browse Source 
If you do:

	$ /bin/rm foo
	$ git status

we used to say "git add ... to add content to commit".  But
suggsting "git add" to record the deletion of a file is simply
insane.

So this rewords various things:

 - The section header is the old "Changed but not updated",
   instead of "Changed but not added";

 - Suggestion is "git add ... to update what will be committed",
   instead of "... to add content to commit";

 - If there are removed paths, the above suggestion becomes "git
   add/rm ... to update what will be committed";

 - For untracked files, the suggestion is "git add ... to
   include in what will be committed".

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-01-11 15:34:41 -08:00
parent 646ac22bdf
commit 4d229653ab
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wt-status.c
View File

@ -15,7 +15,13 @@ static char wt_status_colors[][COLOR_MAXLEN] = {
"\033[31m", /* WT_STATUS_CHANGED: red */ "\033[31m", /* WT_STATUS_CHANGED: red */
"\033[31m", /* WT_STATUS_UNTRACKED: red */ "\033[31m", /* WT_STATUS_UNTRACKED: red */
}; };
static const char* use_add_msg = "use \"git add <file>...\" to incrementally add content to commit";
static const char use_add_msg[] =
"use \"git add <file>...\" to update what will be committed";
static const char use_add_rm_msg[] =
"use \"git add/rm <file>...\" to update what will be committed";
static const char use_add_to_include_msg[] =
"use \"git add <file>...\" to include in what will be committed";
static int parse_status_slot(const char *var, int offset) static int parse_status_slot(const char *var, int offset)
{ {
@ -177,8 +183,14 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q,
struct wt_status *s = data; struct wt_status *s = data;
int i; int i;
if (q->nr) { if (q->nr) {
const char *msg = use_add_msg;
s->workdir_dirty = 1; s->workdir_dirty = 1;
wt_status_print_header("Changed but not added", use_add_msg); for (i = 0; i < q->nr; i++)
if (q->queue[i]->status == DIFF_STATUS_DELETED) {
msg = use_add_rm_msg;
break;
}
wt_status_print_header("Changed but not updated", msg);
} }
for (i = 0; i < q->nr; i++) for (i = 0; i < q->nr; i++)
wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]); wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]);
@ -265,7 +277,8 @@ static void wt_status_print_untracked(struct wt_status *s)
} }
if (!shown_header) { if (!shown_header) {
s->workdir_untracked = 1; s->workdir_untracked = 1;
wt_status_print_header("Untracked files", use_add_msg); wt_status_print_header("Untracked files",
use_add_to_include_msg);
shown_header = 1; shown_header = 1;
} }
color_printf(color(WT_STATUS_HEADER), "#\t"); color_printf(color(WT_STATUS_HEADER), "#\t");