diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-30 20:45:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 20:45:22 (GMT) |
| commit | 7e46f19a105f3798b03ac3887f45034fbfdff676 (patch) | |
| tree | f258b34d49b1e01d41e6de033e091335359cb9a8 /wt-status.c | |
| parent | c7ee0baae7e874898032ab0c63600951eb7c2d18 (diff) | |
| parent | 4ddb1354e8d5daf5671d3d451a67d2d1e82d9b49 (diff) | |
| download | git-7e46f19a105f3798b03ac3887f45034fbfdff676.zip git-7e46f19a105f3798b03ac3887f45034fbfdff676.tar.gz git-7e46f19a105f3798b03ac3887f45034fbfdff676.tar.bz2 | |
Merge branch 'ks/status-initial-commit'
"git status" has long shown essentially the same message as "git
commit"; the message it gives while preparing for the root commit,
i.e. "Initial commit", was hard to understand for some new users.
Now it says "No commits yet" to stress more on the current status
(rather than the commit the user is preparing for, which is more in
line with the focus of "git commit").
* ks/status-initial-commit:
status: contextually notify user about an initial commit
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index 7992a73..8d2fb35 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1601,7 +1601,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 commits yet")); status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", ""); } @@ -1773,7 +1776,7 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) #define LABEL(string) (s->no_gettext ? (string) : _(string)) if (s->is_initial) - color_fprintf(s->fp, header_color, LABEL(N_("Initial commit on "))); + color_fprintf(s->fp, header_color, LABEL(N_("No commits yet on "))); if (!strcmp(s->branch, "HEAD")) { color_fprintf(s->fp, color(WT_STATUS_NOBRANCH, s), "%s", |