i18n: git-bisect die + eval_gettext messages
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
May 21, 2011 at 18:44 UTC
15eaa0494051ae2db7fbc357bd0f5b75d3e17a31
1 file changed
+6
-6
git-bisect.sh
+6
-6
@@ -114,7 +114,7 @@ bisect_start() {
114
*)
115
rev=$(git rev-parse -q --verify "$arg^{commit}") || {
116
test $has_double_dash -eq 1 &&
117
- die "'$arg' does not appear to be a valid revision"
117
+ die "$(eval_gettext "'\$arg' does not appear to be a valid revision")"
118
break
119
}
120
case $bad_seen in
@@ -159,7 +159,7 @@ bisect_write() {
159
case "$state" in
160
bad) tag="$state" ;;
161
good|skip) tag="$state"-"$rev" ;;
162
- *) die "Bad bisect_write argument: $state" ;;
162
+ *) die "$(eval_gettext "Bad bisect_write argument: \$state")" ;;
163
esac
164
git update-ref "refs/bisect/$tag" "$rev" || exit
165
echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
@@ -187,7 +187,7 @@ bisect_skip() {
187
do
188
case "$arg" in
189
*..*)
190
- revs=$(git rev-list "$arg") || die "Bad rev input: $arg" ;;
190
+ revs=$(git rev-list "$arg") || die "$(eval_gettext "Bad rev input: \$arg")" ;;
191
*)
192
revs=$(git rev-parse --sq-quote "$arg") ;;
193
esac
@@ -213,7 +213,7 @@ bisect_state() {
213
for rev in "$@"
214
do
215
sha=$(git rev-parse --verify "$rev^{commit}") ||
216
- die "Bad rev input: $rev"
216
+ die "$(eval_gettext "Bad rev input: \$rev")"
217
eval="$eval bisect_write '$state' '$sha'; "
218
done
219
eval "$eval"
@@ -328,8 +328,8 @@ bisect_reset() {
328
if git checkout "$branch" -- ; then
329
bisect_clean_state
330
else
331
- die "Could not check out original HEAD '$branch'." \
332
- "Try 'git bisect reset <commit>'."
331
+ die "$(eval_gettext "Could not check out original HEAD '\$branch'.
332
+Try 'git bisect reset <commit>'.")"
333
fi
334
}
335