>
> 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.
>
Lesson learned. Will do that from now on :)
--
Regards,
Karthik Nayak
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html