undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-bisect die + eval_gettext messages

Browse Source 
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2011-05-21 18:44:24 +00:00 committed by Junio C Hamano
parent 9570fc1e6a
commit 15eaa04940
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-bisect.sh
View File

@ -114,7 +114,7 @@ bisect_start() {
*) *)
rev=$(git rev-parse -q --verify "$arg^{commit}") || { rev=$(git rev-parse -q --verify "$arg^{commit}") || {
test $has_double_dash -eq 1 && test $has_double_dash -eq 1 &&
die "'$arg' does not appear to be a valid revision" die "$(eval_gettext "'\$arg' does not appear to be a valid revision")"
break break
} }
case $bad_seen in case $bad_seen in
@ -159,7 +159,7 @@ bisect_write() {
case "$state" in case "$state" in
bad) tag="$state" ;; bad) tag="$state" ;;
good|skip) tag="$state"-"$rev" ;; good|skip) tag="$state"-"$rev" ;;
*) die "Bad bisect_write argument: $state" ;; *) die "$(eval_gettext "Bad bisect_write argument: \$state")" ;;
esac esac
git update-ref "refs/bisect/$tag" "$rev" || exit git update-ref "refs/bisect/$tag" "$rev" || exit
echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG" echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
@ -187,7 +187,7 @@ bisect_skip() {
do do
case "$arg" in case "$arg" in
*..*) *..*)
revs=$(git rev-list "$arg") || die "Bad rev input: $arg" ;; revs=$(git rev-list "$arg") || die "$(eval_gettext "Bad rev input: \$arg")" ;;
*) *)
revs=$(git rev-parse --sq-quote "$arg") ;; revs=$(git rev-parse --sq-quote "$arg") ;;
esac esac
@ -213,7 +213,7 @@ bisect_state() {
for rev in "$@" for rev in "$@"
do do
sha=$(git rev-parse --verify "$rev^{commit}") || sha=$(git rev-parse --verify "$rev^{commit}") ||
die "Bad rev input: $rev" die "$(eval_gettext "Bad rev input: \$rev")"
eval="$eval bisect_write '$state' '$sha'; " eval="$eval bisect_write '$state' '$sha'; "
done done
eval "$eval" eval "$eval"
@ -328,8 +328,8 @@ bisect_reset() {
if git checkout "$branch" -- ; then if git checkout "$branch" -- ; then
bisect_clean_state bisect_clean_state
else else
die "Could not check out original HEAD '$branch'." \ die "$(eval_gettext "Could not check out original HEAD '\$branch'.
"Try 'git bisect reset <commit>'." Try 'git bisect reset <commit>'.")"
fi fi
} }