Merge branch 'ly/do-not-localize-bug-messages'
Code clean-up. * ly/do-not-localize-bug-messages: BUG(): remove leading underscore of the format stringmaint
commit
1f622bb0ab
|
@ -41,7 +41,7 @@ static int mktag_fsck_error_func(struct fsck_options *o UNUSED,
|
||||||
fprintf_ln(stderr, _("error: tag input does not pass fsck: %s"), message);
|
fprintf_ln(stderr, _("error: tag input does not pass fsck: %s"), message);
|
||||||
return 1;
|
return 1;
|
||||||
default:
|
default:
|
||||||
BUG(_("%d (FSCK_IGNORE?) should never trigger this callback"),
|
BUG("%d (FSCK_IGNORE?) should never trigger this callback",
|
||||||
msg_type);
|
msg_type);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -621,7 +621,7 @@ static void print_preparing_worktree_line(int detach,
|
||||||
else {
|
else {
|
||||||
struct commit *commit = lookup_commit_reference_by_name(branch);
|
struct commit *commit = lookup_commit_reference_by_name(branch);
|
||||||
if (!commit)
|
if (!commit)
|
||||||
BUG(_("unreachable: invalid reference: %s"), branch);
|
BUG("unreachable: invalid reference: %s", branch);
|
||||||
fprintf_ln(stderr, _("Preparing worktree (detached HEAD %s)"),
|
fprintf_ln(stderr, _("Preparing worktree (detached HEAD %s)"),
|
||||||
repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV));
|
repo_find_unique_abbrev(the_repository, &commit->object.oid, DEFAULT_ABBREV));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1087,7 +1087,7 @@ void bitmap_writer_finish(struct bitmap_writer *writer,
|
||||||
oid_access);
|
oid_access);
|
||||||
|
|
||||||
if (commit_pos < 0)
|
if (commit_pos < 0)
|
||||||
BUG(_("trying to write commit not in index"));
|
BUG("trying to write commit not in index");
|
||||||
stored->commit_pos = commit_pos + base_objects;
|
stored->commit_pos = commit_pos + base_objects;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue