diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-15 21:53:13 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-15 22:31:01 -0800 |
| commit | 82dca84871637ac9812c0dec27f56d07cfba524c (patch) | |
| tree | f0c91933e89b1cfd95dd6368d628ce034e3df510 /wt-status.c | |
| parent | aeb80c70ec2baebbf107de0ea5293984798ddd24 (diff) | |
| download | git-82dca84871637ac9812c0dec27f56d07cfba524c.tar.gz git-82dca84871637ac9812c0dec27f56d07cfba524c.tar.xz | |
Align section headers of 'git status' to new 'git add'.
Now that 'git add' is considered a first-class UI for 'update-index'
and that the 'git add' documentation states "Even modified files
must be added to the set of changes about to be committed" we should
make the output of 'git status' align with that documentation and
common usage.
So now we see a status output such as:
# Added but not yet committed:
# (will commit)
#
# new file: x
#
# Changed but not added:
# (use "git add file1 file2" to include for commit)
#
# modified: x
#
# Untracked files:
# (use "git add" on files to include for commit)
#
# y
which just reads better in the context of using 'git add' to
manipulate a commit (and not a checkin, whatever the heck that is).
We also now support 'color.status.added' as an alias for the existing
'color.status.updated', as this alias more closely aligns with the
current output and documentation.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/wt-status.c b/wt-status.c index 2173d4f66..c388ce129 100644 --- a/wt-status.c +++ b/wt-status.c @@ -21,7 +21,8 @@ static int parse_status_slot(const char *var, int offset) { if (!strcasecmp(var+offset, "header")) return WT_STATUS_HEADER; - if (!strcasecmp(var+offset, "updated")) + if (!strcasecmp(var+offset, "updated") + || !strcasecmp(var+offset, "added")) return WT_STATUS_UPDATED; if (!strcasecmp(var+offset, "changed")) return WT_STATUS_CHANGED; @@ -146,7 +147,7 @@ static void wt_status_print_updated_cb(struct diff_queue_struct *q, if (q->queue[i]->status == 'U') continue; if (!shown_header) { - wt_status_print_header("Updated but not checked in", + wt_status_print_header("Added but not yet committed", "will commit"); s->commitable = 1; shown_header = 1; @@ -163,7 +164,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_add_msg); + wt_status_print_header("Changed but not added", use_add_msg); for (i = 0; i < q->nr; i++) wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]); if (q->nr) @@ -178,7 +179,7 @@ void wt_status_print_initial(struct wt_status *s) read_cache(); if (active_nr) { s->commitable = 1; - wt_status_print_header("Updated but not checked in", + wt_status_print_header("Added but not yet committed", "will commit"); } for (i = 0; i < active_nr; i++) { |