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
--
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