X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=a10b1290bc9218942fcec54b9e930f072ca11bce;hb=3320a973fee4a238e684d0203b0f2d4b941a2c2b;hp=06dcd81b020320fd7b0b8458321d9156b0f0d578;hpb=9f35aaa917455dee3d205fc28e549a3c640fb448;p=git.git diff --git a/git-pull.sh b/git-pull.sh index 06dcd81b0..a10b1290b 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -217,9 +217,12 @@ then # $orig_head commit, but we are merging into $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" - echo >&2 "Warning: commit $orig_head." + ( + eval_gettext "Warning: fetch updated the current branch head. +Warning: fast-forwarding your working tree from +Warning: commit \$orig_head." && + echo + ) >&2 git update-index -q --refresh git read-tree -u -m "$orig_head" "$curr_head" || die "$(eval_gettext "Cannot fast-forward your working tree.