summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-25 16:00:16 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-25 16:00:16 -0700
commit957450054cfbbe0d4ae8d33f7b74eace6e290f16 (patch)
tree65c27de698831bd6222152aa3dff0d7319628f27 /git-submodule.sh
parent1952e102b702b977d6bdfcee7cb48b843cb92049 (diff)
parent6ff875c52ae48b8fe6a350df110e33aa2ba8afbc (diff)
downloadgit-957450054cfbbe0d4ae8d33f7b74eace6e290f16.tar.gz
Merge branch 'js/i18n-scripts'
* js/i18n-scripts: submodule: take advantage of gettextln and eval_gettextln. stash: take advantage of eval_gettextln pull: take advantage of eval_gettextln git-am: take advantage of gettextln and eval_gettextln. gettext: add gettextln, eval_gettextln to encode common idiom
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh18
1 files changed, 6 insertions, 12 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index f46862f61b..814d0d914e 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -228,12 +228,9 @@ cmd_add()
if test -z "$force" && ! git add --dry-run --ignore-missing "$path" > /dev/null 2>&1
then
- (
- eval_gettext "The following path is ignored by one of your .gitignore files:
+ eval_gettextln "The following path is ignored by one of your .gitignore files:
\$path
-Use -f if you really want to add it." &&
- echo
- ) >&2
+Use -f if you really want to add it." >&2
exit 1
fi
@@ -242,7 +239,7 @@ Use -f if you really want to add it." &&
then
if test -d "$path"/.git -o -f "$path"/.git
then
- eval_gettext "Adding existing repo at '\$path' to the index"; echo
+ eval_gettextln "Adding existing repo at '\$path' to the index"
else
die "$(eval_gettext "'\$path' already exists and is not a valid git repo")"
fi
@@ -701,10 +698,7 @@ cmd_summary() {
;; # removed
*)
# unexpected type
- (
- eval_gettext "unexpected mode \$mod_dst" &&
- echo
- ) >&2
+ eval_gettextln "unexpected mode \$mod_dst" >&2
continue ;;
esac
fi
@@ -791,9 +785,9 @@ cmd_summary() {
done |
if test -n "$for_status"; then
if [ -n "$files" ]; then
- gettext "# Submodules changed but not updated:"; echo
+ gettextln "# Submodules changed but not updated:"
else
- gettext "# Submodule changes to be committed:"; echo
+ gettextln "# Submodule changes to be committed:"
fi
echo "#"
sed -e 's|^|# |' -e 's|^# $|#|'