diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2011-08-07 21:58:15 +1000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:04:42 -0700 |
| commit | c2b1a95c468d742e61fcb7c6e1592f7f5be60ea6 (patch) | |
| tree | df73a8dedfe0e6e36ac75124170ef10c2904db9b /git-pull.sh | |
| parent | de88c1ceda8ded0722faaa6ddcc2375957ef8732 (diff) | |
| download | git-c2b1a95c468d742e61fcb7c6e1592f7f5be60ea6.tar.gz git-c2b1a95c468d742e61fcb7c6e1592f7f5be60ea6.tar.xz | |
pull: take advantage of eval_gettextln
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-pull.sh b/git-pull.sh index a10b1290b..d3ffd8fc6 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -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. |