mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-pull eval_gettext + warning message

Browse Source 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2011-05-21 18:43:57 +00:00
committed by Junio C Hamano
parent 9f35aaa917
commit 3320a973fe
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
git-pull.sh
View File

@ -217,9 +217,12 @@ then
# $orig_head commit, but we are merging into $curr_head. # $orig_head commit, but we are merging into $curr_head.
# First update the working tree to match $curr_head. # First update the working tree to match $curr_head.
echo >&2 "Warning: fetch updated the current branch head." (
echo >&2 "Warning: fast-forwarding your working tree from" eval_gettext "Warning: fetch updated the current branch head.
echo >&2 "Warning: commit $orig_head." Warning: fast-forwarding your working tree from
Warning: commit \$orig_head." &&
echo
) >&2
git update-index -q --refresh git update-index -q --refresh
git read-tree -u -m "$orig_head" "$curr_head" || git read-tree -u -m "$orig_head" "$curr_head" ||
die "$(eval_gettext "Cannot fast-forward your working tree. die "$(eval_gettext "Cannot fast-forward your working tree.