mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-22 01:36:09 +02:00
Code

Merge branch 'va/i18n-even-more' 

* va/i18n-even-more:
  i18n: fix misconversion in shell scripts
This commit is contained in:
Junio C Hamano 2016-12-27 00:11:45 -08:00
parent ad1b4e2c0e acefe2be28
commit eef32a0653
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-rebase--interactive.sh
View File

@ -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.")"

4
git-sh-setup.sh
View File

@ -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.")"
}
}