diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-27 09:11:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-27 09:11:45 +0100 |
| commit | eef32a0653f9b4e90ace46c9f041ff41dbf4e632 (patch) | |
| tree | 6ffa066e35d25d17d3f657a5e7e793bdfa3dc53f /git-rebase--interactive.sh | |
| parent | Merge branch 'lt/shortlog-by-committer' (diff) | |
| parent | i18n: fix misconversion in shell scripts (diff) | |
| download | git-eef32a0653f9b4e90ace46c9f041ff41dbf4e632.tar.xz git-eef32a0653f9b4e90ace46c9f041ff41dbf4e632.zip | |
Merge branch 'va/i18n-even-more'
* va/i18n-even-more:
i18n: fix misconversion in shell scripts
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 41fd374c72..b0a6f2b7ba 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -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.")" |