From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthieu Moy Subject: [PATCH 01/10] Better "Changed but not updated" message in git-status Date: Tue, 2 Nov 2010 16:31:19 +0100 Message-ID: <1288711888-21528-2-git-send-email-Matthieu.Moy@imag.fr> References: <1288711888-21528-1-git-send-email-Matthieu.Moy@imag.fr> Cc: Matthieu Moy To: git@vger.kernel.org, gitster@pobox.com X-From: git-owner@vger.kernel.org Tue Nov 02 16:33:11 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PDIrF-0003dU-RP for gcvg-git-2@lo.gmane.org; Tue, 02 Nov 2010 16:33:10 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753791Ab0KBPc7 (ORCPT ); Tue, 2 Nov 2010 11:32:59 -0400 Received: from mx2.imag.fr ([129.88.30.17]:54773 "EHLO rominette.imag.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753779Ab0KBPc5 (ORCPT ); Tue, 2 Nov 2010 11:32:57 -0400 Received: from mail-veri.imag.fr (mail-veri.imag.fr [129.88.43.52]) by rominette.imag.fr (8.13.8/8.13.8) with ESMTP id oA2FPCOa022881 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Tue, 2 Nov 2010 16:25:12 +0100 Received: from bauges.imag.fr ([129.88.43.5]) by mail-veri.imag.fr with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PDIpn-00025T-Fd; Tue, 02 Nov 2010 16:31:39 +0100 Received: from moy by bauges.imag.fr with local (Exim 4.69) (envelope-from ) id 1PDIpn-0005c2-Dk; Tue, 02 Nov 2010 16:31:39 +0100 X-Mailer: git-send-email 1.7.3.2.183.g2e7b0 In-Reply-To: <1288711888-21528-1-git-send-email-Matthieu.Moy@imag.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (rominette.imag.fr [129.88.30.17]); Tue, 02 Nov 2010 16:25:12 +0100 (CET) X-IMAG-MailScanner-Information: Please contact MI2S MIM for more information X-MailScanner-ID: oA2FPCOa022881 X-IMAG-MailScanner: Found to be clean X-IMAG-MailScanner-SpamCheck: X-IMAG-MailScanner-From: moy@imag.fr MailScanner-NULL-Check: 1289316316.06121@kUCsf76fHCqyIF2fv2okeQ Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Older Gits talked about "updating" a file to add its content to the index, but this terminology is confusing for new users. "to stage" is far more intuitive and already used in e.g. the "git stage" command name. Signed-off-by: Matthieu Moy --- Documentation/gittutorial-2.txt | 2 +- t/t7508-status.sh | 34 +++++++++++++++++----------------- wt-status.c | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt index ecab0c0..7fe5848 100644 --- a/Documentation/gittutorial-2.txt +++ b/Documentation/gittutorial-2.txt @@ -373,7 +373,7 @@ $ git status # # new file: closing.txt # -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # # modified: file.txt diff --git a/t/t7508-status.sh b/t/t7508-status.sh index c9300f3..4de3e27 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -44,7 +44,7 @@ cat >expect <<\EOF # # new file: dir2/added # -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -73,7 +73,7 @@ cat >expect <<\EOF # Changes to be committed: # new file: dir2/added # -# Changed but not updated: +# Changes not staged for commit: # modified: dir1/modified # # Untracked files: @@ -140,7 +140,7 @@ cat >expect <..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -167,7 +167,7 @@ cat >expect <expect <..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -260,7 +260,7 @@ cat >expect <..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -320,7 +320,7 @@ cat >expect <<\EOF # # new file: ../dir2/added # -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -392,7 +392,7 @@ cat >expect <<\EOF # # new file: dir2/added # -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -521,7 +521,7 @@ cat >expect <<\EOF # # new file: dir2/added # -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -614,7 +614,7 @@ cat >expect <..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -673,7 +673,7 @@ cat >expect <..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -718,7 +718,7 @@ test_expect_success 'status -s submodule summary' ' cat >expect <..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -766,7 +766,7 @@ cat >expect <..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -819,7 +819,7 @@ cat > expect << EOF # # modified: sm # -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -931,7 +931,7 @@ cat > expect << EOF # # modified: sm # -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # (commit or discard the untracked or modified content in submodules) @@ -989,7 +989,7 @@ cat > expect << EOF # # modified: sm # -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # @@ -1067,7 +1067,7 @@ test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary cat > expect << EOF # On branch master -# Changed but not updated: +# Changes not staged for commit: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # diff --git a/wt-status.c b/wt-status.c index fc2438f..d9f3d9f 100644 --- a/wt-status.c +++ b/wt-status.c @@ -88,7 +88,7 @@ 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:"); + color_fprintf_ln(s->fp, c, "# Changes not staged for commit:"); if (!advice_status_hints) return; if (!has_deleted) -- 1.7.3.2.183.g2e7b0