зеркало из https://github.com/microsoft/git.git
pull: take advantage of eval_gettextln
Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
de88c1ceda
Коммит
c2b1a95c46
|
@ -217,12 +217,9 @@ then
|
|||
# $orig_head commit, but we are merging into $curr_head.
|
||||
# First update the working tree to match $curr_head.
|
||||
|
||||
(
|
||||
eval_gettext "Warning: fetch updated the current branch head.
|
||||
eval_gettextln "Warning: fetch updated the current branch head.
|
||||
Warning: fast-forwarding your working tree from
|
||||
Warning: commit \$orig_head." &&
|
||||
echo
|
||||
) >&2
|
||||
Warning: commit \$orig_head." >&2
|
||||
git update-index -q --refresh
|
||||
git read-tree -u -m "$orig_head" "$curr_head" ||
|
||||
die "$(eval_gettext "Cannot fast-forward your working tree.
|
||||
|
|
Загрузка…
Ссылка в новой задаче