From: Junio C Hamano <gitster@pobox.com>
To: Karthik Nayak <karthik.188@gmail.com>
Cc: git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH v6 05/17] ref-filter: move get_head_description() from branch.c
Date: Tue, 17 May 2016 12:59:30 -0700 [thread overview]
Message-ID: <xmqqtwhwv4kd.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1463309133-14503-6-git-send-email-Karthik.188@gmail.com> (Karthik Nayak's message of "Sun, 15 May 2016 16:15:21 +0530")
Karthik Nayak <karthik.188@gmail.com> writes:
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 2ecde53..141168d 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -361,39 +361,6 @@ static void add_verbose_info(struct strbuf *out, struct ref_array_item *item,
> strbuf_release(&subject);
> }
>
> -static char *get_head_description(void)
> -{
> - struct strbuf desc = STRBUF_INIT;
> - struct wt_status_state state;
> - memset(&state, 0, sizeof(state));
> - wt_status_get_state(&state, 1);
> - if (state.rebase_in_progress ||
> - state.rebase_interactive_in_progress)
> - strbuf_addf(&desc, _("(no branch, rebasing %s)"),
> - state.branch);
> - else if (state.bisect_in_progress)
> - strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
> - state.branch);
> - else if (state.detached_from) {
> - if (state.detached_at)
> - /* TRANSLATORS: make sure this matches
> - "HEAD detached at " in wt-status.c */
> - strbuf_addf(&desc, _("(HEAD detached at %s)"),
> - state.detached_from);
> - else
> - /* TRANSLATORS: make sure this matches
> - "HEAD detached from " in wt-status.c */
> - strbuf_addf(&desc, _("(HEAD detached from %s)"),
> - state.detached_from);
> - }
Note that this expects that va/i18n-misc-updates topic, which
corrects the translator instruction around here, is already applied.
> diff --git a/ref-filter.c b/ref-filter.c
> index 7d3af1c..fcb3353 100644
> ...
> +char *get_head_description(void)
> +{
> + struct strbuf desc = STRBUF_INIT;
> + struct wt_status_state state;
> + memset(&state, 0, sizeof(state));
> + wt_status_get_state(&state, 1);
> + if (state.rebase_in_progress ||
> + state.rebase_interactive_in_progress)
> + strbuf_addf(&desc, _("(no branch, rebasing %s)"),
> + state.branch);
> + else if (state.bisect_in_progress)
> + strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
> + state.branch);
> + else if (state.detached_from) {
> + /* TRANSLATORS: make sure these match _("HEAD detached at ")
> + and _("HEAD detached from ") in wt-status.c */
> + if (state.detached_at)
> + strbuf_addf(&desc, _("(HEAD detached at %s)"),
> + state.detached_from);
> + else
> + strbuf_addf(&desc, _("(HEAD detached from %s)"),
> + state.detached_from);
> + }
... but the change is apparently lost.
It is a good lesson not to blindly rebase things on 'next', which
would have unrelated changes. If you needed es/test-gpg-tags topic
for the test script change, check out 'master', merge that single
topic, and then rebase the series on top of the result.
next prev parent reply other threads:[~2016-05-17 19:59 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-15 10:45 [PATCH v6 00/17] Port branch.c to use ref-filter's printing options Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 01/17] ref-filter: implement %(if), %(then), and %(else) atoms Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 02/17] ref-filter: include reference to 'used_atom' within 'atom_value' Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 03/17] ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>) Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 04/17] ref-filter: modify "%(objectname:short)" to take length Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 05/17] ref-filter: move get_head_description() from branch.c Karthik Nayak
2016-05-17 19:59 ` Junio C Hamano [this message]
2016-05-20 14:20 ` Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 06/17] ref-filter: introduce format_ref_array_item() Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 07/17] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 08/17] ref-filter: add support for %(upstream:track,nobracket) Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 09/17] ref-filter: make "%(symref)" atom work with the ':short' modifier Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 10/17] ref-filter: introduce refname_atom_parser_internal() Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 11/17] ref-filter: introduce symref_atom_parser() and refname_atom_parser() Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 12/17] ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal() Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 13/17] ref-filter: add `:dir` and `:base` options for ref printing atoms Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 14/17] ref-filter: allow porcelain to translate messages in the output Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 15/17] branch, tag: use porcelain output Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 16/17] branch: use ref-filter printing APIs Karthik Nayak
2016-05-15 10:45 ` [PATCH v6 17/17] branch: implement '--format' option Karthik Nayak
2016-05-16 22:12 ` [PATCH v6 00/17] Port branch.c to use ref-filter's printing options Junio C Hamano
2016-05-17 8:04 ` Karthik Nayak
2016-05-17 17:52 ` Junio C Hamano
2016-05-17 19:02 ` Karthik Nayak
2016-05-17 20:30 ` Junio C Hamano
2016-05-18 10:45 ` Karthik Nayak
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=xmqqtwhwv4kd.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=karthik.188@gmail.com \
--cc=peff@peff.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).