Revision c7cb333f60db9b8313da75c2075a3619202e905d authored by Junio C Hamano on 12 March 2014, 20:43:51 UTC, committed by Junio C Hamano on 12 March 2014, 21:08:05 UTC
When we show unmerged paths, we had an artificial 20 columns floor
for the width of labels (e.g. "both deleted:") shown next to the
pathnames.  Depending on the locale, this may result in a label that
is too wide when all the label strings are way shorter than 20
columns, or no-op when a label string is longer than 20 columns.

Just drop the artificial floor.  The screen real estate is better
utilized this way when all the strings are shorter.

Adjust the tests to this change.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 8f17f5b
Raw File
git-sh-i18n--envsubst.txt
git-sh-i18n{litdd}envsubst(1)
=============================

NAME
----
git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks

SYNOPSIS
--------
[verse]
eval_gettext () {
	printf "%s" "$1" | (
		export PATH $('git sh-i18n{litdd}envsubst' --variables "$1");
		'git sh-i18n{litdd}envsubst' "$1"
	)
}

DESCRIPTION
-----------

This is not a command the end user would want to run.  Ever.
This documentation is meant for people who are studying the
plumbing scripts and/or are writing new ones.

'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU
`envsubst(1)` program that comes with the GNU gettext package. It's
used internally by linkgit:git-sh-i18n[1] to interpolate the variables
passed to the `eval_gettext` function.

No promises are made about the interface, or that this
program won't disappear without warning in the next version
of Git. Don't use it.

GIT
---
Part of the linkgit:git[1] suite
back to top