git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH 2/2] Align section headers of 'git status' to new 'git add'.
Date: Thu, 14 Dec 2006 19:13:55 -0500	[thread overview]
Message-ID: <20061215001355.GB26755@spearce.org> (raw)
In-Reply-To: <2d2d4a64dab54a6d156b599afd69d7607fb228f6.1166141607.git.spearce@spearce.org>

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" on files 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).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 Documentation/git-runstatus.txt |    6 +++---
 Documentation/git-status.txt    |    6 +++---
 Documentation/tutorial-2.txt    |   10 +++++-----
 wt-status.c                     |    4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Documentation/git-runstatus.txt b/Documentation/git-runstatus.txt
index 89d7b92..e76ef05 100644
--- a/Documentation/git-runstatus.txt
+++ b/Documentation/git-runstatus.txt
@@ -16,9 +16,9 @@ DESCRIPTION
 Examines paths in the working tree that has changes unrecorded
 to the index file, and changes between the index file and the
 current HEAD commit.  The former paths are what you _could_
-commit by running 'git-update-index' before running 'git
-commit', and the latter paths are what you _would_ commit by
-running 'git commit'.
+commit by running 'git-add' before running 'git commit', and
+the latter paths are what you _would_ commit by running
+'git commit'.
 
 If there is no path that is different between the index file and
 the current HEAD commit, the command exits with non-zero status.
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index ce7857e..0dd9136 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -15,9 +15,9 @@ DESCRIPTION
 Examines paths in the working tree that has changes unrecorded
 to the index file, and changes between the index file and the
 current HEAD commit.  The former paths are what you _could_
-commit by running 'git-update-index' before running 'git
-commit', and the latter paths are what you _would_ commit by
-running 'git commit'.
+commit by running 'git-add' before running 'git commit', and
+the latter paths are what you _would_ commit by running
+'git commit'.
 
 If there is no path that is different between the index file and
 the current HEAD commit, the command exits with non-zero
diff --git a/Documentation/tutorial-2.txt b/Documentation/tutorial-2.txt
index f7f2e1c..918a562 100644
--- a/Documentation/tutorial-2.txt
+++ b/Documentation/tutorial-2.txt
@@ -341,23 +341,23 @@ situation:
 ------------------------------------------------
 $ git status
 #
-# Updated but not checked in:
+# Added but not yet committed:
 #   (will commit)
 #
 #       new file: closing.txt
 #
 #
-# Changed but not updated:
-#   (use git-update-index to mark for commit)
+# Changed but not added:
+#   (use "git add" on files to include for commit)
 #
 #       modified: file.txt
 #
 ------------------------------------------------
 
 Since the current state of closing.txt is cached in the index file,
-it is listed as "updated but not checked in".  Since file.txt has
+it is listed as "added but not yet committed".  Since file.txt has
 changes in the working directory that aren't reflected in the index,
-it is marked "changed but not updated".  At this point, running "git
+it is marked "changed but not added".  At this point, running "git
 commit" would create a commit that added closing.txt (with its new
 contents), but that didn't modify file.txt.
 
diff --git a/wt-status.c b/wt-status.c
index f9ed54f..8cc4d5d 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -162,7 +162,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",
+		wt_status_print_header("Changed but not added",
 				"use \"git add\" on files to include for commit");
 	for (i = 0; i < q->nr; i++)
 		wt_status_print_filepair(WT_STATUS_CHANGED, q->queue[i]);
@@ -178,7 +178,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++) {
-- 

       reply	other threads:[~2006-12-15  0:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <2d2d4a64dab54a6d156b599afd69d7607fb228f6.1166141607.git.spearce@spearce.org>
2006-12-15  0:13 ` Shawn O. Pearce [this message]
     [not found] <0191094fd2ac0afb27b31b9a90d98dfa4ec03b17.1166237566.git.spearce@spearce.org>
2006-12-16  2:53 ` [PATCH 2/2] Align section headers of 'git status' to new 'git add' Shawn O. Pearce

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20061215001355.GB26755@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).