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

i18n: git-pull die messages

Browse source 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-05-21 18:43:55 +00:00 committed by Junio C Hamano
parent a9f5786852
commit 85af5f82a6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
git-pull.sh
View file

@ -18,20 +18,20 @@ cd_to_toplevel
die_conflict () {
git diff-index --cached --name-status -r --ignore-submodules HEAD --
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
die "Pull is not possible because you have unmerged files.
die "$(gettext "Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'."
as appropriate to mark resolution, or use 'git commit -a'.")"
else
die "Pull is not possible because you have unmerged files."
die "$(gettext "Pull is not possible because you have unmerged files.")"
fi
}
die_merge () {
if [ $(git config --bool --get advice.resolveConflict || echo true) = "true" ]; then
die "You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge."
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.")"
else
die "You have not concluded your merge (MERGE_HEAD exists)."
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).")"
fi
}
@ -186,7 +186,7 @@ test true = "$rebase" && {
# On an unborn branch
if test -f "$GIT_DIR/index"
then
die "updating an unborn branch with changes added to the index"
die "$(gettext "updating an unborn branch with changes added to the index")"
fi
else
require_clean_work_tree "pull with rebase" "Please commit or stash them."
@ -242,11 +242,11 @@ case "$merge_head" in
?*' '?*)
if test -z "$orig_head"
then
die "Cannot merge multiple branches into empty head"
die "$(gettext "Cannot merge multiple branches into empty head")"
fi
if test true = "$rebase"
then
die "Cannot rebase onto multiple branches"
die "$(gettext "Cannot rebase onto multiple branches")"
fi
;;
esac