i18n: git-am multi-line getttext $msg; echo
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>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:43 UTC
bd8643ae51622abadd47535ea2f7763282f7d8ec
1 file changed
+5
-5
git-am.sh
+5
-5
@@ -757,16 +757,16 @@ do
757
# working tree.
758
resolved=
759
git diff-index --quiet --cached HEAD -- && {
760
- echo "No changes - did you forget to use 'git add'?"
761
- echo "If there is nothing left to stage, chances are that something else"
762
- echo "already introduced the same changes; you might want to skip this patch."
760
+ gettext "No changes - did you forget to use 'git add'?
761
+If there is nothing left to stage, chances are that something else
762
+already introduced the same changes; you might want to skip this patch."; echo
763
stop_here_user_resolve $this
764
}
765
unmerged=$(git ls-files -u)
766
if test -n "$unmerged"
767
then
768
- echo "You still have unmerged paths in your index"
769
- echo "did you forget to use 'git add'?"
768
+ gettext "You still have unmerged paths in your index
769
+did you forget to use 'git add'?"; echo
770
stop_here_user_resolve $this
771
fi
772
apply_status=0