mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

die(_("BUG")): avoid translating bug messages

Browse source 
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>
This commit is contained in:
Johannes Schindelin 2016-07-26 18:05:53 +02:00 committed by Junio C Hamano
parent ef1177d18e
commit 7e97e10033
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
merge-recursive.c
View file

@ -967,7 +967,7 @@ static struct merge_file_info merge_file_1(struct merge_options *o,
if (!oid_eq(&a->oid, &b->oid))
result.clean = 0;
} else
die(_("BUG: unsupported object type in the tree"));
die("BUG: unsupported object type in the tree");
}
return result;
@ -1811,7 +1811,7 @@ static int process_entry(struct merge_options *o,
*/
remove_file(o, 1, path, !a_mode);
} else
die(_("BUG: fatal merge failure, shouldn't happen."));
die("BUG: fatal merge failure, shouldn't happen.");
return clean_merge;
}
@ -1869,7 +1869,7 @@ int merge_trees(struct merge_options *o,
for (i = 0; i < entries->nr; i++) {
struct stage_data *e = entries->items[i].util;
if (!e->processed)
die(_("BUG: unprocessed path??? %s"),
die("BUG: unprocessed path??? %s",
entries->items[i].string);
}