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

submodule: take advantage of gettextln and eval_gettextln. 

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jon Seymour 2011-08-07 21:58:17 +10:00 committed by Junio C Hamano
parent 6fdd50e95c
commit 6ff875c52a
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-submodule.sh
View File

@ -223,12 +223,9 @@ cmd_add()


if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1 if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
then then
( eval_gettextln "The following path is ignored by one of your .gitignore files:
eval_gettext "The following path is ignored by one of your .gitignore files:
\$path \$path
Use -f if you really want to add it." && Use -f if you really want to add it." >&2
echo
) >&2
exit 1 exit 1
fi fi


@ -237,7 +234,7 @@ Use -f if you really want to add it." &&
then then
if test -d "$path"/.git -o -f "$path"/.git if test -d "$path"/.git -o -f "$path"/.git
then then
eval_gettext "Adding existing repo at '\$path' to the index"; echo eval_gettextln "Adding existing repo at '\$path' to the index"
else else
die "$(eval_gettext "'\$path' already exists and is not a valid git repo")" die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
fi fi
@ -696,10 +693,7 @@ cmd_summary() {
;; # removed ;; # removed
*) *)
# unexpected type # unexpected type
( eval_gettextln "unexpected mode \$mod_dst" >&2
eval_gettext "unexpected mode \$mod_dst" &&
echo
) >&2
continue ;; continue ;;
esac esac
fi fi
@ -786,9 +780,9 @@ cmd_summary() {
done | done |
if test -n "$for_status"; then if test -n "$for_status"; then
if [ -n "$files" ]; then if [ -n "$files" ]; then
gettext "# Submodules changed but not updated:"; echo gettextln "# Submodules changed but not updated:"
else else
gettext "# Submodule changes to be committed:"; echo gettextln "# Submodule changes to be committed:"
fi fi
echo "#" echo "#"
sed -e 's|^|# |' -e 's|^# $|#|' sed -e 's|^|# |' -e 's|^# $|#|'