diff options
| -rw-r--r-- | git-rebase--interactive.sh | 3 | ||||
| -rw-r--r-- | git-sh-setup.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a545d92c2..c5806859f 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -467,7 +467,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.")" diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 2eda13480..c7b2a9546 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -194,14 +194,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.")" } } |