mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 18:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

i18n: git-am multi-line getttext $msg; echo

Browse Source 
When we have multi-line `gettext $msg; echo' messages we can't
preserve the existing indenting because gettext(1) can't accept input
on stdin.

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:44 +00:00 committed by Junio C Hamano
parent 81dd2fe542
commit bd8643ae51
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-am.sh
View File

@ -757,16 +757,16 @@ do
# working tree.
resolved=
git diff-index --quiet --cached HEAD -- && {
echo "No changes - did you forget to use 'git add'?"
echo "If there is nothing left to stage, chances are that something else"
echo "already introduced the same changes; you might want to skip this patch."
gettext "No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch."; echo
stop_here_user_resolve $this
}
unmerged=$(git ls-files -u)
if test -n "$unmerged"
then
echo "You still have unmerged paths in your index"
echo "did you forget to use 'git add'?"
gettext "You still have unmerged paths in your index
did you forget to use 'git add'?"; echo
stop_here_user_resolve $this
fi
apply_status=0