From: Johannes Sixt <j6t@kdbg.org>
Date: Thu, 30 Jun 2016 05:38:01 GMT
Subject: Re: [PATCH 1/9] Report bugs consistently
Message-ID: <5774B039.8080802@kdbg.org>
In-Reply-To: <8615dc276828a3f99a27ff2eda9909548a7d435e.1467199553.git.johannes.schindelin@gmx.de>

Am 29.06.2016 um 13:36 schrieb Johannes Schindelin:
> @@ -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"));

Would it perhaps make sense to remove the _() markup (here and a few 
more instances in this patch)? It's simpler for developers to find the 
code location when a "BUG:" is reported untranslated.

-- Hannes