git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 46/51] i18n: git-bisect die + eval_gettext messages

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Apr 3, 2011, 16:46 UTC
Message-ID
<1301849175-1697-47-git-send-email-avarab@gmail.com>
In-Reply-To
<1301849175-1697-1-git-send-email-avarab@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-bisect.sh |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/git-bisect.sh b/git-bisect.sh
index ef9af0b..2e755cd 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -111,7 +111,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
@@ -156,7 +156,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"
@@ -184,7 +184,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
@@ -210,7 +210,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"
@@ -322,8 +322,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
 }
 
-- 
1.7.4.1
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 52 of 59 in “i18n: Shell script translations”
  1. 00/51 i18n: Shell script translationsÆvar Arnfjörð Bjarmason, Apr 3, 2011
  2. 01/51 i18n: git-am add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  3. 02/51 i18n: git-am one-line gettext $msg; echoÆvar Arnfjörð Bjarmason, Apr 3, 2011
  4. 03/51 i18n: git-am multi-line getttext $msg; echoÆvar Arnfjörð Bjarmason, Apr 3, 2011
  5. 04/51 i18n: git-am eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  6. 05/51 i18n: git-am echo + gettext messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  7. 06/51 i18n: git-am die messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  8. 07/51 i18n: git-am cannot_fallback messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  9. 08/51 i18n: git-am clean_abort messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  10. 09/51 i18n: git-am "Apply?" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  11. 10/51 i18n: git-am core say messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  12. Jakub NarebskiApr 3, 2011
  13. Ævar Arnfjörð BjarmasonApr 3, 2011
  14. 11/51 i18n: git-am printf(1) message to eval_gettextÆvar Arnfjörð Bjarmason, Apr 3, 2011
  15. 12/51 i18n: git-pull add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  16. 13/51 i18n: git-pull die messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  17. Ævar Arnfjörð BjarmasonApr 3, 2011
  18. 14/51 i18n: git-pull eval_gettext + die messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  19. 15/51 i18n: git-pull eval_gettext + warning messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  20. 16/51 i18n: git-pull split up "no candidate" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  21. 17/51 i18n: git-pull "You asked to pull" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  22. 18/51 i18n: git-pull "[...] not currently on a branch" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  23. 19/51 i18n: git-pull "rebase against" / "merge with" messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  24. Martin von ZweigbergkApr 3, 2011
  25. Ævar Arnfjörð BjarmasonApr 4, 2011
  26. 20/51 i18n: git-submodule add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  27. 21/51 i18n: git-submodule echo + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  28. 22/51 i18n: git-submodule say + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  29. 23/51 i18n: git-submodule die + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  30. 24/51 i18n: git-submodule $update_module say + die messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  31. 25/51 i18n: git-submodule "cached cannot be used" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  32. 26/51 i18n: git-submodule "Submodule change[...]" messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  33. 27/51 i18n: git-submodule $errmsg messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  34. 28/51 i18n: git-submodule "Entering [...]" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  35. 29/51 i18n: git-submodule "[...] path is ignored" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  36. 30/51 i18n: git-submodule "path not initialized" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  37. 31/51 i18n: git-submodule "blob" and "submodule" messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  38. 32/51 i18n: git-stash add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  39. 33/51 i18n: git-stash echo + gettext messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  40. 34/51 i18n: git-stash say + gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  41. 35/51 i18n: git-stash die + gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  42. 36/51 i18n: git-stash die + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  43. 37/51 i18n: git-stash die + eval_gettext $* messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  44. 38/51 i18n: git-stash die + eval_gettext $1 messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  45. 39/51 i18n: git-stash "unknown option" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  46. 40/51 i18n: git-stash drop_stash say/die messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  47. 41/51 i18n: git-bisect add git-sh-i18nÆvar Arnfjörð Bjarmason, Apr 3, 2011
  48. 42/51 i18n: git-bisect gettext + echo messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  49. 43/51 i18n: git-bisect echo + gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  50. 44/51 i18n: git-bisect echo + eval_gettext messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  51. 45/51 i18n: git-bisect die + gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  52. 46/51 i18n: git-bisect die + eval_gettext messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  53. 47/51 i18n: git-bisect bisect_run + $@ messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  54. 48/51 i18n: git-bisect bisect_reset + $1 messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  55. 49/51 i18n: git-bisect bisect_replay + $1 messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  56. 50/51 i18n: git-bisect [Y/n] messagesÆvar Arnfjörð Bjarmason, Apr 3, 2011
  57. 51/51 i18n: git-bisect bisect_next_check "You need to" messageÆvar Arnfjörð Bjarmason, Apr 3, 2011
  58. Junio C HamanoApr 3, 2011
  59. Ævar Arnfjörð BjarmasonApr 10, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.