kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

i18n: git-am die messages 

The die messages in git-am need to use:

    die "$(gettext "string")"

Since gettext(1) emits the message instead of returning it like the C
equivalent, and our die() function in git-sh-setup needs to get a
string as an argument.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2011-05-21 18:43:47 +00:00 committed by Junio C Hamano
parent 22fdd11432
commit 790872592e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
git-am.sh
View File

@ -44,7 +44,7 @@ require_work_tree
cd_to_toplevel cd_to_toplevel


git var GIT_COMMITTER_IDENT >/dev/null || git var GIT_COMMITTER_IDENT >/dev/null ||
die "You need to set your committer info first" die "$(gettext "You need to set your committer info first")"


if git rev-parse --verify -q HEAD >/dev/null if git rev-parse --verify -q HEAD >/dev/null
then then
@ -362,7 +362,7 @@ do
--rebasing) --rebasing)
rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;; rebasing=t threeway=t keep=t scissors=f no_inbody_headers=t ;;
-d|--dotest) -d|--dotest)
die "-d option is no longer supported. Do not use." die "$(gettext "-d option is no longer supported. Do not use.")"
;; ;;
--resolvemsg) --resolvemsg)
shift; resolvemsg=$1 ;; shift; resolvemsg=$1 ;;
@ -425,12 +425,12 @@ then
false false
;; ;;
esac || esac ||
die "previous rebase directory $dotest still exists but mbox given." die "$(eval_gettext "previous rebase directory \$dotest still exists but mbox given.")"
resume=yes resume=yes


case "$skip,$abort" in case "$skip,$abort" in
t,t) t,t)
die "Please make up your mind. --skip or --abort?" die "$(gettext "Please make up your mind. --skip or --abort?")"
;; ;;
t,) t,)
git rerere clear git rerere clear
@ -457,7 +457,7 @@ then
else else
# Make sure we are not given --skip, --resolved, nor --abort # Make sure we are not given --skip, --resolved, nor --abort
test "$skip$resolved$abort" = "" || test "$skip$resolved$abort" = "" ||
die "Resolve operation not in progress, we are not resuming." die "$(gettext "Resolve operation not in progress, we are not resuming.")"


# Start afresh. # Start afresh.
mkdir -p "$dotest" || exit mkdir -p "$dotest" || exit
@ -522,7 +522,7 @@ case "$resolved" in
if test "$files" if test "$files"
then then
test -n "$HAS_HEAD" && : >"$dotest/dirtyindex" test -n "$HAS_HEAD" && : >"$dotest/dirtyindex"
die "Dirty index: cannot apply patches (dirty: $files)" die "$(eval_gettext "Dirty index: cannot apply patches (dirty: \$files)")"
fi fi
esac esac


@ -695,7 +695,7 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."; ec
if test "$interactive" = t if test "$interactive" = t
then then
test -t 0 || test -t 0 ||
die "cannot be interactive without stdin connected to a terminal." die "$(gettext "cannot be interactive without stdin connected to a terminal.")"
action=again action=again
while test "$action" = again while test "$action" = again
do do