diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-07-26 16:05:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-26 18:13:44 (GMT) |
| commit | 7e97e1003349107b9fdc388bb4aa006fae9ab560 (patch) | |
| tree | 3dd84b8b34cb3b45d02051229aad776377786eb1 /merge-recursive.c | |
| parent | ef1177d18e35c030c37aa533002a11d98361e6b9 (diff) | |
| download | git-7e97e1003349107b9fdc388bb4aa006fae9ab560.zip git-7e97e1003349107b9fdc388bb4aa006fae9ab560.tar.gz git-7e97e1003349107b9fdc388bb4aa006fae9ab560.tar.bz2 | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 4338b73..1b6db87 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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); } |