From: Junio C Hamano <gitster@pobox.com>
To: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Cc: Jeff King <peff@peff.net>,
git@vger.kernel.org, sandals@crustytoothpaste.net
Subject: Re: [PATCH] wt-status.c: Modified status message shown for a parent-less branch
Date: Mon, 12 Jun 2017 11:28:56 -0700 [thread overview]
Message-ID: <xmqqa85dnjpz.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1497255003.1718.1.camel@gmail.com> (Kaartic Sivaraam's message of "Mon, 12 Jun 2017 13:40:03 +0530")
Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> writes:
>> Adding a bit to "struct wt_status" is a good first step to allow all
>> three (i.e. in addition to "Initial commit" and "Changes to be
>> committed", "Changes not staged for commit" is the other one that
>> shares this potential confusion factor) to be phrased in a way that
>> is more appropriate in an answer to the question "what is the status
>> of my working area?", I would think.
>>
>> Thanks.
>>
> It seems that the current change has to be discarded altogether and
> further the change required doesn't look trivial. This seems to warrant
> some bit of research of the code base. As a first step I would like to
> know which part of the code base creates the commit template. I guess
> much can't be done without knowing how it's created.
Perhaps something along this line (warning: not even compile
tested)?
builtin/commit.c | 1 +
wt-status.c | 15 ++++++++++++---
wt-status.h | 1 +
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index da1ba4c862..ffb2d71d3d 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1652,6 +1652,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
usage_with_options(builtin_commit_usage, builtin_commit_options);
status_init_config(&s, git_commit_config);
+ s.commit_template = 1;
status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
s.colopts = 0;
diff --git a/wt-status.c b/wt-status.c
index 25aafc35c8..006aaf9e76 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -196,7 +196,10 @@ static void wt_longstatus_print_cached_header(struct wt_status *s)
{
const char *c = color(WT_STATUS_HEADER, s);
- status_printf_ln(s, c, _("Changes to be committed:"));
+ if (s->commit_template)
+ status_printf_ln(s, c, _("Changes to be committed:"));
+ else
+ status_printf_ln(s, c, _("Changes already in the index:"));
if (!s->hints)
return;
if (s->whence != FROM_COMMIT)
@@ -214,7 +217,10 @@ static void wt_longstatus_print_dirty_header(struct wt_status *s,
{
const char *c = color(WT_STATUS_HEADER, s);
- status_printf_ln(s, c, _("Changes not staged for commit:"));
+ if (s->commit_template)
+ status_printf_ln(s, c, _("Changes not staged for commit:"));
+ else
+ status_printf_ln(s, c, _("Changes not yet in the index:"));
if (!s->hints)
return;
if (!has_deleted)
@@ -1578,7 +1584,10 @@ static void wt_longstatus_print(struct wt_status *s)
if (s->is_initial) {
status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
- status_printf_ln(s, color(WT_STATUS_HEADER, s), _("Initial commit"));
+ status_printf_ln(s, color(WT_STATUS_HEADER, s),
+ s->commit_template
+ ? _("Initial commit")
+ : _("No commit yet on the branch"));
status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
}
diff --git a/wt-status.h b/wt-status.h
index 8a3864783b..17f72f2346 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -77,6 +77,7 @@ struct wt_status {
unsigned colopts;
int null_termination;
int show_branch;
+ int commit_template;
int hints;
enum wt_status_format status_format;
next prev parent reply other threads:[~2017-06-12 18:29 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-10 1:52 [PATCH] wt-status.c: Modified status message shown for a parent-less branch Kaartic Sivaraam
2017-06-10 2:10 ` Kaartic Sivaraam
2017-06-10 2:23 ` Junio C Hamano
2017-06-10 8:44 ` Kaartic Sivaraam
2017-06-10 9:36 ` Kaartic Sivaraam
2017-06-10 10:21 ` Jeff King
2017-06-10 11:02 ` Junio C Hamano
2017-06-12 8:10 ` Kaartic Sivaraam
2017-06-12 18:28 ` Junio C Hamano [this message]
2017-06-12 21:20 ` Jeff King
2017-06-12 21:31 ` Junio C Hamano
2017-06-12 21:37 ` Jeff King
2017-06-15 8:19 ` Kaartic Sivaraam
2017-06-15 8:42 ` Jeff King
2017-06-15 11:43 ` Samuel Lijin
2017-06-15 13:12 ` Jeff King
2017-06-16 10:36 ` Kaartic Sivaraam
2017-06-16 10:50 ` Jeff King
2017-06-18 7:35 ` [PATCH/Almost final] " Kaartic Sivaraam
2017-06-18 7:53 ` [PATCH/ALMOST FINAL] Contextually notify user about an initial commit Kaartic Sivaraam
2017-06-18 8:34 ` Ævar Arnfjörð Bjarmason
2017-06-19 2:41 ` [PATCH 1/2] " Kaartic Sivaraam
2017-06-19 2:44 ` [PATCH 2/2] Add test for the new status message Kaartic Sivaraam
2017-06-19 4:32 ` Junio C Hamano
2017-06-19 17:59 ` Kaartic Sivaraam
2017-06-19 18:04 ` Jeff King
2017-06-19 18:33 ` Kaartic Sivaraam
2017-06-19 4:29 ` [PATCH 1/2] Contextually notify user about an initial commit Junio C Hamano
2017-06-19 2:41 ` [PATCH 2/2] Add test for the new status message Kaartic Sivaraam
2017-06-19 9:10 ` [PATCH/ALMOST FINAL] Contextually notify user about an initial commit Jeff King
2017-06-19 13:24 ` Kaartic Sivaraam
2017-06-19 15:47 ` Junio C Hamano
2017-06-20 3:02 ` [PATCH 1/3] " Kaartic Sivaraam
2017-06-20 3:02 ` [PATCH 2/3] Update test(s) that used old status message Kaartic Sivaraam
2017-06-20 3:02 ` [PATCH 3/3] Add tests for the contextual initial " Kaartic Sivaraam
2017-06-20 7:26 ` [PATCH 1/3] Contextually notify user about an initial commit Ævar Arnfjörð Bjarmason
2017-06-20 13:37 ` Kaartic Sivaraam
2017-06-20 14:41 ` Ævar Arnfjörð Bjarmason
2017-06-21 2:34 ` Kaartic Sivaraam
2017-06-21 2:37 ` [PATCH/FINAL] status: contextually " Kaartic Sivaraam
2017-06-21 14:35 ` Kaartic Sivaraam
2017-06-21 14:52 ` Ævar Arnfjörð Bjarmason
2017-06-21 17:45 ` Kaartic Sivaraam
2017-06-21 18:45 ` Junio C Hamano
2017-06-21 18:16 ` Kaartic Sivaraam
2017-06-22 2:10 ` Junio C Hamano
2017-06-22 3:01 ` Kaartic Sivaraam
2017-06-10 14:44 ` [PATCH] wt-status.c: Modified status message shown for a parent-less branch Philip Oakley
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa85dnjpz.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kaarticsivaraam91196@gmail.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).