development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues 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
Show stats 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.
# 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.