diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:43:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:15 -0700 |
| commit | 3320a973fee4a238e684d0203b0f2d4b941a2c2b (patch) | |
| tree | 2cc717cccb7e40aa333c70c5f7f7b559b4b0a034 /git-pull.sh | |
| parent | 9f35aaa917455dee3d205fc28e549a3c640fb448 (diff) | |
| download | git-3320a973fee4a238e684d0203b0f2d4b941a2c2b.tar.gz git-3320a973fee4a238e684d0203b0f2d4b941a2c2b.tar.xz | |
i18n: git-pull eval_gettext + warning message
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 9 |
1 files changed, 6 insertions, 3 deletions
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. |