зеркало из https://github.com/microsoft/git.git
Merge branch 'va/i18n-even-more'
* va/i18n-even-more: i18n: fix misconversion in shell scripts
This commit is contained in:
Коммит
eef32a0653
|
@ -437,7 +437,8 @@ update_squash_messages () {
|
|||
}' <"$squash_msg".bak
|
||||
} >"$squash_msg"
|
||||
else
|
||||
commit_message HEAD > "$fixup_msg" || die "$(gettext "Cannot write \$fixup_msg")"
|
||||
commit_message HEAD >"$fixup_msg" ||
|
||||
die "$(eval_gettext "Cannot write \$fixup_msg")"
|
||||
count=2
|
||||
{
|
||||
printf '%s\n' "$comment_char $(gettext "This is a combination of 2 commits.")"
|
||||
|
|
|
@ -196,14 +196,14 @@ require_work_tree_exists () {
|
|||
if test "z$(git rev-parse --is-bare-repository)" != zfalse
|
||||
then
|
||||
program_name=$0
|
||||
die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
|
||||
die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"
|
||||
fi
|
||||
}
|
||||
|
||||
require_work_tree () {
|
||||
test "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = true || {
|
||||
program_name=$0
|
||||
die "$(gettext "fatal: \$program_name cannot be used without a working tree.")"
|
||||
die "$(eval_gettext "fatal: \$program_name cannot be used without a working tree.")"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче