From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sat, 21 May 2011 18:44:27 +0000 (+0000)
Subject: i18n: git-bisect bisect_replay + $1 messages
X-Git-Tag: v1.7.7-rc0~116^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=55a9fc80438744eb09d2146a1c85798fbdd27764;p=git.git

i18n: git-bisect bisect_replay + $1 messages

Gettextize bisect_replay messages that use the $1 variable. Since it's
subroutine local we have to provide an alias for it for eval_gettext.

Since I was doing that anyway I've changed all other uses of $1
variable to use the alias variable for clarity.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-bisect.sh b/git-bisect.sh
index 4dc28ecdf..58b24e384 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -354,8 +354,9 @@ bisect_clean_state() {
 }
 
 bisect_replay () {
-	test "$#" -eq 1 || die "No logfile given"
-	test -r "$1" || die "cannot read $1 for replaying"
+	file="$1"
+	test "$#" -eq 1 || die "$(gettext "No logfile given")"
+	test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")"
 	bisect_reset
 	while read git bisect command rev
 	do
@@ -373,7 +374,7 @@ bisect_replay () {
 		*)
 			die "$(gettext "?? what are you talking about?")" ;;
 		esac
-	done <"$1"
+	done <"$file"
 	bisect_auto_next
 }