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

pull: take advantage of eval_gettextln

Browse Source 
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jon Seymour
2011-08-07 21:58:15 +10:00
committed by Junio C Hamano
parent de88c1ceda
commit c2b1a95c46
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-pull.sh
View File

@ -217,12 +217,9 @@ 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.
( eval_gettextln "Warning: fetch updated the current branch head.
eval_gettext "Warning: fetch updated the current branch head.
Warning: fast-forwarding your working tree from Warning: fast-forwarding your working tree from
Warning: commit \$orig_head." && Warning: commit \$orig_head." >&2
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.