From: Duy Nguyen <pclouds@gmail.com>
Date: Sat, 02 Jul 2016 05:11:40 GMT
Subject: Re: [PATCH 1/9] Report bugs consistently
Message-ID: <CACsJy8A1ZU8VgBYmQAVC6LmXMVgt5CgvC_w0Y7Y6oX88RFO3dw@mail.gmail.com>
In-Reply-To: <8615dc276828a3f99a27ff2eda9909548a7d435e.1467199553.git.johannes.schindelin@gmx.de>

On Wed, Jun 29, 2016 at 1:36 PM, Johannes Schindelin
<johannes.schindelin@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.
-- 
Duy