summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-05-21 18:43:44 +0000
committerJunio C Hamano <gitster@pobox.com>2011-05-21 11:57:13 -0700
commitbd8643ae51622abadd47535ea2f7763282f7d8ec (patch)
treece5874486b25ed4733dc8f80f12948ff43ec1588 /git-am.sh
parent81dd2fe542f68d1f4c286806ce1560b269c79275 (diff)
downloadgit-bd8643ae51622abadd47535ea2f7763282f7d8ec.tar.gz
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/git-am.sh b/git-am.sh
index f54f13d984..5a152b0878 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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