On Sat, Jul 2, 2016 at 9:25 AM, Johannes Schindelin
<johannes.schinde...@gmx.de> wrote:
> Hi Duy,
>
> On Sat, 2 Jul 2016, Duy Nguyen wrote:
>
>> On Wed, Jun 29, 2016 at 1:36 PM, Johannes Schindelin
>> <johannes.schinde...@gmx.de> wrote:
>> > @@ -955,9 +955,8 @@ static struct merge_file_info merge_file_1(struct
>> > merge_options *o,
>> >
>> > if (!sha_eq(a->sha1, b->sha1))
>> > result.clean = 0;
>> > - } else {
>> > - die(_("unsupported object type in the tree"));
>> > - }
>> > + } else
>> > + die(_("BUG: unsupported object type in the tree"));
>>
>> As a message targeting developers, we do not need to mark this for
>> translation. There are a couple other _() in this patch that should be
>> removed as well.
>
> Yes, Hannes already pointed that out.
Ah.. sorry I didn't read the whole thread.
> My answer is the same: it is not the purpose of this patch series to fix
> this, and therefore it retains the previous behavior.
You're changing the string and adding more work to translators. So
either leave the string untouched, or drop _().
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
