mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: git-bisect die + 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:23 +00:00 committed by Junio C Hamano
parent c6649c9271
commit 9570fc1e6a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
git-bisect.sh
View File

@ -61,7 +61,7 @@ bisect_start() {
# #
head=$(GIT_DIR="$GIT_DIR" git symbolic-ref -q HEAD) || head=$(GIT_DIR="$GIT_DIR" git symbolic-ref -q HEAD) ||
head=$(GIT_DIR="$GIT_DIR" git rev-parse --verify HEAD) || head=$(GIT_DIR="$GIT_DIR" git rev-parse --verify HEAD) ||
die "Bad HEAD - I need a HEAD" die "$(gettext "Bad HEAD - I need a HEAD")"
# #
# Check if we are bisecting. # Check if we are bisecting.
@ -80,11 +80,11 @@ bisect_start() {
# cogito usage, and cogito users should understand # cogito usage, and cogito users should understand
# it relates to cg-seek. # it relates to cg-seek.
[ -s "$GIT_DIR/head-name" ] && [ -s "$GIT_DIR/head-name" ] &&
die "won't bisect on seeked tree" die "$(gettext "won't bisect on seeked tree")"
start_head="${head#refs/heads/}" start_head="${head#refs/heads/}"
;; ;;
*) *)
die "Bad HEAD - strange symbolic ref" die "$(gettext "Bad HEAD - strange symbolic ref")"
;; ;;
esac esac
fi fi
@ -201,10 +201,10 @@ bisect_state() {
state=$1 state=$1
case "$#,$state" in case "$#,$state" in
0,*) 0,*)
die "Please call 'bisect_state' with at least one argument." ;; die "$(gettext "Please call 'bisect_state' with at least one argument.")" ;;
1,bad|1,good|1,skip) 1,bad|1,good|1,skip)
rev=$(git rev-parse --verify HEAD) || rev=$(git rev-parse --verify HEAD) ||
die "Bad rev input: HEAD" die "$(gettext "Bad rev input: HEAD")"
bisect_write "$state" "$rev" bisect_write "$state" "$rev"
check_expected_revs "$rev" ;; check_expected_revs "$rev" ;;
2,bad|*,good|*,skip) 2,bad|*,good|*,skip)
@ -219,7 +219,7 @@ bisect_state() {
eval "$eval" eval "$eval"
check_expected_revs "$@" ;; check_expected_revs "$@" ;;
*,bad) *,bad)
die "'git bisect bad' can take only one argument." ;; die "$(gettext "'git bisect bad' can take only one argument.")" ;;
*) *)
usage ;; usage ;;
esac esac
@ -369,7 +369,7 @@ bisect_replay () {
good|bad|skip) good|bad|skip)
bisect_write "$command" "$rev" ;; bisect_write "$command" "$rev" ;;
*) *)
die "?? what are you talking about?" ;; die "$(gettext "?? what are you talking about?")" ;;
esac esac
done <"$1" done <"$1"
bisect_auto_next bisect_auto_next
@ -434,7 +434,7 @@ bisect_run () {
} }
bisect_log () { bisect_log () {
test -s "$GIT_DIR/BISECT_LOG" || die "We are not bisecting." test -s "$GIT_DIR/BISECT_LOG" || die "$(gettext "We are not bisecting.")"
cat "$GIT_DIR/BISECT_LOG" cat "$GIT_DIR/BISECT_LOG"
} }