die(_("BUG")): avoid translating bug messages
While working on the patch series that avoids die()ing in recursive merges, the issue came up that bug reports (i.e. die("BUG: ...") constructs) should never be translated, as the target audience is the Git developer community, not necessarily the current user, and hence a translated message would make it *harder* to address the problem. So let's stop translating the obvious ones. As it is really, really outside the purview of this patch series to see whether there are more die() statements that report bugs and are currently translated, that task is left for another day and patch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 26, 2016 at 18:05 UTC
7e97e1003349107b9fdc388bb4aa006fae9ab560
1 file changed
+3
-3
merge-recursive.c
+3
-3
@@ -967,7 +967,7 @@ static struct merge_file_info merge_file_1(struct merge_options *o,
967
if (!oid_eq(&a->oid, &b->oid))
968
result.clean = 0;
969
} else
970
- die(_("BUG: unsupported object type in the tree"));
970
+ die("BUG: unsupported object type in the tree");
971
}
972
973
return result;
@@ -1811,7 +1811,7 @@ static int process_entry(struct merge_options *o,
1811
*/
1812
remove_file(o, 1, path, !a_mode);
1813
} else
1814
- die(_("BUG: fatal merge failure, shouldn't happen."));
1814
+ die("BUG: fatal merge failure, shouldn't happen.");
1815
1816
return clean_merge;
1817
}
@@ -1869,7 +1869,7 @@ int merge_trees(struct merge_options *o,
1869
for (i = 0; i < entries->nr; i++) {
1870
struct stage_data *e = entries->items[i].util;
1871
if (!e->processed)
1872
- die(_("BUG: unprocessed path??? %s"),
1872
+ die("BUG: unprocessed path??? %s",
1873
entries->items[i].string);
1874
}
1875