Currently, if you want to use gettext or eval_gettext to format a message you may have to add a separate echo statement and a surrounding subshell in order to interpolate the required trailing new line. This patch introduces two new helper functions, gettextln and eval_gettextln which append a trailing newline to the gettext output. This allows constructions of the form: if test -s "$GIT_DIR/BISECT_START" then ( gettext "You need to give me at least one good and one bad revisions. (You can use \"git bisect bad\" and \"git bisect good\" for that.)" && echo ) >&2 else ... to be expressed more concisely as: if test -s "$GIT_DIR/BISECT_START" then gettextln "You need to give me at least one good and one bad revisions. (You can use \"git bisect bad\" and \"git bisect good\" for that.)" >&2 else ... Applies cleanly to master and pu. Revisions ========= v2: Split modifications to git-sh-i18n.sh into separate commit. Extended application to: git-am.sh git-pull.sh git-stash.sh git-submodule.sh Removed application to git-bisect.sh, pending stabilisation of this series and js/bisect-no-checkout in next or master. v1: Initial RFC. Included example of application to git-bisect.sh. Future ====== Apply to git-bisect.sh Jon Seymour (5): gettext: add gettextln, eval_gettextln to encode common idiom git-am: take advantage of gettextln and eval_gettextln. pull: take advantage of eval_gettextln stash: take advantage of eval_gettextln submodule: take advantage of gettextln and eval_gettextln. git-am.sh | 31 ++++++++++++++----------------- git-pull.sh | 7 ++----- git-sh-i18n.sh | 19 +++++++++++++++++++ git-stash.sh | 9 +++------ git-submodule.sh | 18 ++++++------------ 5 files changed, 44 insertions(+), 40 deletions(-) -- 1.7.6.363.g9b380.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html