diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2011-05-21 18:44:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-21 11:57:18 -0700 |
| commit | 15eaa0494051ae2db7fbc357bd0f5b75d3e17a31 (patch) | |
| tree | 6b3729b57aa3c5e2bf89db7e4075f9e20e257ed5 /git-bisect.sh | |
| parent | 9570fc1e6acff65f762b6d540b9ed7fe967a98d6 (diff) | |
| download | git-15eaa0494051ae2db7fbc357bd0f5b75d3e17a31.tar.gz | |
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>
Diffstat (limited to 'git-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 876fdd1f0b..8491490171 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -114,7 +114,7 @@ bisect_start() { *) rev=$(git rev-parse -q --verify "$arg^{commit}") || { 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 } case $bad_seen in @@ -159,7 +159,7 @@ bisect_write() { case "$state" in bad) tag="$state" ;; good|skip) tag="$state"-"$rev" ;; - *) die "Bad bisect_write argument: $state" ;; + *) die "$(eval_gettext "Bad bisect_write argument: \$state")" ;; esac git update-ref "refs/bisect/$tag" "$rev" || exit echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG" @@ -187,7 +187,7 @@ bisect_skip() { do 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") ;; esac @@ -213,7 +213,7 @@ bisect_state() { for rev in "$@" do 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'; " done eval "$eval" @@ -328,8 +328,8 @@ bisect_reset() { if git checkout "$branch" -- ; then bisect_clean_state else - die "Could not check out original HEAD '$branch'." \ - "Try 'git bisect reset <commit>'." + die "$(eval_gettext "Could not check out original HEAD '\$branch'. +Try 'git bisect reset <commit>'.")" fi } |