{"thread":{"id":"25100","subject":"[PATCH/RFC 00/20] gettextize: git-stash & git-bisect","startedAt":"2010-09-14T13:52:00Z","lastAt":"2010-09-14T13:52:20Z","messageCount":21,"participants":["Ævar Arnfjörð Bjarmason"],"isPatch":true,"patchVersion":1,"patchTotal":20},"messages":[{"id":"150673","messageId":"1284472340-7049-1-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":null,"subject":"[PATCH/RFC 00/20] gettextize: git-stash & git-bisect","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:00Z","receivedAt":"2010-09-14T13:52:00Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"This is an RFC on a series that makes git-stash.sh and git-bisect.sh\ntranslatable. With this git-rebase is the only mainporcelain command\nthat isn't translatable (soon to be fixed).\n\nI'll be folding this into the next version of the ab/i18n series I'll\nbe sending to Junio. No need to apply it to the current one.\n\nNote that this isn't diff --check clean, because the code I'm altering\nwasn't:\n\n    git-bisect.sh:117: indent with spaces.\n    +                       die \"$(eval_gettext \"'\\$arg' does not appear to be a valid revision\")\"\n    git-bisect.sh:190: indent with spaces.\n    +                revs=$(git rev-list \"$arg\") || die \"$(eval_gettext \"Bad rev input: \\$arg\")\" ;;\n\nPatches to fix these whitespace issues can come later after the i18n\nseries is applied.\n\nÆvar Arnfjörð Bjarmason (20):\n  gettextize: git-stash add git-sh-i18n\n  gettextize: git-stash echo + gettext message\n  gettextize: git-stash say + gettext messages\n  gettextize: git-stash die + gettext messages\n  gettextize: git-stash die + eval_gettext messages\n  gettextize: git-stash die + eval_gettext $* messages\n  gettextize: git-stash die + eval_gettext $1 messages\n  gettextize: git-stash \"unknown option\" message\n  gettextize: git-stash drop_stash say/die messages\n  gettextize: git-bisect add git-sh-i18n\n  gettextize: git-bisect gettext + echo message\n  gettextize: git-bisect echo + gettext messages\n  gettextize: git-bisect echo + eval_gettext message\n  gettextize: git-bisect die + gettext messages\n  gettextize: git-bisect die + eval_gettext messages\n  gettextize: git-bisect bisect_run + $@ messages\n  gettextize: git-bisect bisect_reset + $1 messages\n  gettextize: git-bisect bisect_replay + $1 messages\n  gettextize: git-bisect [Y/n] messages\n  gettextize: git-bisect bisect_next_check \"You need to\" message\n\n git-bisect.sh |   84 ++++++++++++++++++++++++++++++++------------------------\n git-stash.sh  |   75 +++++++++++++++++++++++++++++++-------------------\n 2 files changed, 94 insertions(+), 65 deletions(-)\n\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150674","messageId":"1284472340-7049-2-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 01/20] gettextize: git-stash add git-sh-i18n","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:01Z","receivedAt":"2010-09-14T13:52:01Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 7ce818b..e89a629 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -13,6 +13,7 @@ USAGE=\"list [<options>]\n SUBDIRECTORY_OK=Yes\n OPTIONS_SPEC=\n . git-sh-setup\n+. git-sh-i18n\n require_work_tree\n cd_to_toplevel\n \n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150675","messageId":"1284472340-7049-3-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 02/20] gettextize: git-stash echo + gettext message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:02Z","receivedAt":"2010-09-14T13:52:02Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex e89a629..efffdce 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -408,7 +408,7 @@ apply_stash () {\n \t\tstatus=$?\n \t\tif test -n \"$INDEX_OPTION\"\n \t\tthen\n-\t\t\techo >&2 'Index was not unstashed.'\n+\t\t\techo >&2 \"$(gettext \"Index was not unstashed.\")\"\n \t\tfi\n \t\texit $status\n \tfi\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150676","messageId":"1284472340-7049-4-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 03/20] gettextize: git-stash say + gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:03Z","receivedAt":"2010-09-14T13:52:03Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex efffdce..78f392a 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -167,7 +167,7 @@ save_stash () {\n \tgit update-index -q --refresh\n \tif no_changes\n \tthen\n-\t\tsay 'No local changes to save'\n+\t\tsay \"$(gettext \"No local changes to save\")\"\n \t\texit 0\n \tfi\n \ttest -f \"$GIT_DIR/logs/$ref_stash\" ||\n@@ -503,7 +503,7 @@ branch)\n \tcase $# in\n \t0)\n \t\tsave_stash &&\n-\t\tsay '(To restore them type \"git stash apply\")'\n+\t\tsay \"$(gettext \"(To restore them type \\\"git stash apply\\\")\")\"\n \t\t;;\n \t*)\n \t\tusage\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150679","messageId":"1284472340-7049-5-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 04/20] gettextize: git-stash die + gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:04Z","receivedAt":"2010-09-14T13:52:04Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |   36 ++++++++++++++++++------------------\n 1 files changed, 18 insertions(+), 18 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 78f392a..3a0f917 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -38,7 +38,7 @@ no_changes () {\n clear_stash () {\n \tif test $# != 0\n \tthen\n-\t\tdie \"git stash clear with parameters is unimplemented\"\n+\t\tdie \"$(gettext \"git stash clear with parameters is unimplemented\")\"\n \tfi\n \tif current=$(git rev-parse --verify $ref_stash 2>/dev/null)\n \tthen\n@@ -60,7 +60,7 @@ create_stash () {\n \tthen\n \t\thead=$(git rev-list --oneline -n 1 HEAD --)\n \telse\n-\t\tdie \"You do not have the initial commit yet\"\n+\t\tdie \"$(gettext \"You do not have the initial commit yet\")\"\n \tfi\n \n \tif branch=$(git symbolic-ref -q HEAD)\n@@ -75,7 +75,7 @@ create_stash () {\n \ti_tree=$(git write-tree) &&\n \ti_commit=$(printf 'index on %s\\n' \"$msg\" |\n \t\tgit commit-tree $i_tree -p $b_commit) ||\n-\t\tdie \"Cannot save the current index state\"\n+\t\tdie \"$(gettext \"Cannot save the current index state\")\"\n \n \tif test -z \"$patch_mode\"\n \tthen\n@@ -91,7 +91,7 @@ create_stash () {\n \t\t\tgit write-tree &&\n \t\t\trm -f \"$TMP-index\"\n \t\t) ) ||\n-\t\t\tdie \"Cannot save the current worktree state\"\n+\t\t\tdie \"$(gettext \"Cannot save the current worktree state\")\"\n \n \telse\n \n@@ -104,14 +104,14 @@ create_stash () {\n \n \t\t# state of the working tree\n \t\tw_tree=$(GIT_INDEX_FILE=\"$TMP-index\" git write-tree) ||\n-\t\tdie \"Cannot save the current worktree state\"\n+\t\tdie \"$(gettext \"Cannot save the current worktree state\")\"\n \n \t\tgit diff-tree -p HEAD $w_tree > \"$TMP-patch\" &&\n \t\ttest -s \"$TMP-patch\" ||\n-\t\tdie \"No changes selected\"\n+\t\tdie \"$(gettext \"No changes selected\")\"\n \n \t\trm -f \"$TMP-index\" ||\n-\t\tdie \"Cannot remove temporary index (can't happen)\"\n+\t\tdie \"$(gettext \"Cannot remove temporary index (can't happen)\")\"\n \n \tfi\n \n@@ -124,7 +124,7 @@ create_stash () {\n \tfi\n \tw_commit=$(printf '%s\\n' \"$stash_msg\" |\n \t\tgit commit-tree $w_tree -p $b_commit -p $i_commit) ||\n-\t\tdie \"Cannot record working tree state\"\n+\t\tdie \"$(gettext \"Cannot record working tree state\")\"\n }\n \n save_stash () {\n@@ -171,7 +171,7 @@ save_stash () {\n \t\texit 0\n \tfi\n \ttest -f \"$GIT_DIR/logs/$ref_stash\" ||\n-\t\tclear_stash || die \"Cannot initialize stash\"\n+\t\tclear_stash || die \"$(gettext \"Cannot initialize stash\")\"\n \n \tcreate_stash \"$stash_msg\"\n \n@@ -179,7 +179,7 @@ save_stash () {\n \t: >>\"$GIT_DIR/logs/$ref_stash\"\n \n \tgit update-ref -m \"$stash_msg\" $ref_stash $w_commit ||\n-\t\tdie \"Cannot save the current status\"\n+\t\tdie \"$(gettext \"Cannot save the current status\")\"\n \tsay Saved working directory and index state \"$stash_msg\"\n \n \tif test -z \"$patch_mode\"\n@@ -192,7 +192,7 @@ save_stash () {\n \t\tfi\n \telse\n \t\tgit apply -R < \"$TMP-patch\" ||\n-\t\tdie \"Cannot remove worktree changes\"\n+\t\tdie \"$(gettext \"Cannot remove worktree changes\")\"\n \n \t\tif test -z \"$keep_index\"\n \t\tthen\n@@ -294,7 +294,7 @@ parse_flags_and_rev()\n \n \tcase $# in\n \t\t0)\n-\t\t\thave_stash || die \"No stash found.\"\n+\t\t\thave_stash || die \"$(gettext \"No stash found.\")\"\n \t\t\tset -- ${ref_stash}@{0}\n \t\t;;\n \t\t1)\n@@ -354,11 +354,11 @@ apply_stash () {\n \n \tgit update-index -q --refresh &&\n \tgit diff-files --quiet --ignore-submodules ||\n-\t\tdie 'Cannot apply to a dirty working tree, please stage your changes'\n+\t\tdie \"$(gettext \"Cannot apply to a dirty working tree, please stage your changes\")\"\n \n \t# current index state\n \tc_tree=$(git write-tree) ||\n-\t\tdie 'Cannot apply a stash in the middle of a merge'\n+\t\tdie \"$(gettext \"Cannot apply a stash in the middle of a merge\")\"\n \n \tunstashed_index_tree=\n \tif test -n \"$INDEX_OPTION\" && test \"$b_tree\" != \"$i_tree\" &&\n@@ -366,9 +366,9 @@ apply_stash () {\n \tthen\n \t\tgit diff-tree --binary $s^2^..$s^2 | git apply --cached\n \t\ttest $? -ne 0 &&\n-\t\t\tdie 'Conflicts in index. Try without --index.'\n+\t\t\tdie \"$(gettext \"Conflicts in index. Try without --index.\")\"\n \t\tunstashed_index_tree=$(git write-tree) ||\n-\t\t\tdie 'Could not save index tree'\n+\t\t\tdie \"$(gettext \"Could not save index tree\")\"\n \t\tgit reset\n \tfi\n \n@@ -394,7 +394,7 @@ apply_stash () {\n \t\t\tgit diff-index --cached --name-only --diff-filter=A $c_tree >\"$a\" &&\n \t\t\tgit read-tree --reset $c_tree &&\n \t\t\tgit update-index --add --stdin <\"$a\" ||\n-\t\t\t\tdie \"Cannot unstage modified files\"\n+\t\t\t\tdie \"$(gettext \"Cannot unstage modified files\")\"\n \t\t\trm -f \"$a\"\n \t\tfi\n \t\tsquelch=\n@@ -432,7 +432,7 @@ drop_stash () {\n }\n \n apply_to_branch () {\n-\ttest -n \"$1\" || die 'No branch name specified'\n+\ttest -n \"$1\" || die \"$(gettext \"No branch name specified\")\"\n \tbranch=$1\n \tshift 1\n \n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150690","messageId":"1284472340-7049-6-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 05/20] gettextize: git-stash die + eval_gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:05Z","receivedAt":"2010-09-14T13:52:05Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 3a0f917..38720b8 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -301,7 +301,7 @@ parse_flags_and_rev()\n \t\t\t:\n \t\t;;\n \t\t*)\n-\t\t\tdie \"Too many revisions specified: $REV\"\n+\t\t\tdie \"$(eval_gettext \"Too many revisions specified: \\$REV\")\"\n \t\t;;\n \tesac\n \n@@ -325,7 +325,7 @@ parse_flags_and_rev()\n \t\t# this condition with a non-zero status code but as of 1.7.2.1 it\n \t\t# it did not. So, we use non-empty stderr output as a proxy for the\n \t\t# condition of interest.\n-\t\ttest -z \"$(git rev-parse \"$REV\" 2>&1 >/dev/null)\" || die \"$REV does not exist in the stash log\"\n+\t\ttest -z \"$(git rev-parse \"$REV\" 2>&1 >/dev/null)\" || die \"$(eval_gettext \"\\$REV does not exist in the stash log\")\"\n \tfi\n \n }\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150678","messageId":"1284472340-7049-7-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 06/20] gettextize: git-stash die + eval_gettext $* messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:06Z","receivedAt":"2010-09-14T13:52:06Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize messages that used the $* variable. Since it's subroutine\nlocal we have to provide an alias for it for eval_gettext.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |   10 ++++++++--\n 1 files changed, 8 insertions(+), 2 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 38720b8..f3ea9e8 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -337,7 +337,10 @@ is_stash_like()\n }\n \n assert_stash_like() {\n-\tis_stash_like \"$@\" || die \"'$*' is not a stash-like commit\"\n+\tis_stash_like \"$@\" || {\n+\t\targs=\"$*\"\n+\t\tdie \"$(eval_gettext \"'\\$args' is not a stash-like commit\")\"\n+\t}\n }\n \n is_stash_ref() {\n@@ -345,7 +348,10 @@ is_stash_ref() {\n }\n \n assert_stash_ref() {\n-\tis_stash_ref \"$@\" || die \"'$*' is not a stash reference\"\n+\tis_stash_ref \"$@\" || {\n+\t\targs=\"$*\"\n+\t\tdie \"$(eval_gettext \"'\\$args' is not a stash reference\")\"\n+\t}\n }\n \n apply_stash () {\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150680","messageId":"1284472340-7049-8-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 07/20] gettextize: git-stash die + eval_gettext $1 messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:07Z","receivedAt":"2010-09-14T13:52:07Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize a messages that used the $1 variable. Since it's subroutine\nlocal we have to provide an alias for it for eval_gettext.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |    5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex f3ea9e8..7c005d3 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -305,7 +305,10 @@ parse_flags_and_rev()\n \t\t;;\n \tesac\n \n-\tREV=$(git rev-parse --quiet --symbolic --verify $1 2>/dev/null) || die \"$1 is not valid reference\"\n+\tREV=$(git rev-parse --quiet --symbolic --verify $1 2>/dev/null) || {\n+\t\treference=\"$1\"\n+\t\tdie \"$(eval_gettext \"\\$reference is not valid reference\")\"\n+\t}\n \n \ti_commit=$(git rev-parse --quiet --verify $REV^2 2>/dev/null) &&\n \tset -- $(git rev-parse $REV $REV^1 $REV: $REV^1: $REV^2: 2>/dev/null) &&\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150689","messageId":"1284472340-7049-9-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 08/20] gettextize: git-stash \"unknown option\" message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:08Z","receivedAt":"2010-09-14T13:52:08Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the \"unknown option for 'stash save'\" message that's shown\non:\n\n    $ git stash save --blah-blah\n    error: unknown option for 'stash save': --blah-blah\n           To provide a message, use git stash save -- '--blah-blah'\n    Usage: git stash list [<options>]\n\nIn a translation the second line should be aligned with the first\none. I've added a TRANSLATORS comment to indicate this.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |   10 ++++++++--\n 1 files changed, 8 insertions(+), 2 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 7c005d3..63885a3 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -151,8 +151,14 @@ save_stash () {\n \t\t\tbreak\n \t\t\t;;\n \t\t-*)\n-\t\t\techo \"error: unknown option for 'stash save': $1\"\n-\t\t\techo \"       To provide a message, use git stash save -- '$1'\"\n+\t\t\toption=\"$1\"\n+\t\t\t# TRANSLATORS: $option is an invalid option, like\n+\t\t\t# `--blah-blah'. The 7 spaces at the beginning of the\n+\t\t\t# second line correspond to \"error: \". So you should line\n+\t\t\t# up the second line with however many characters the\n+\t\t\t# translation of \"error: \" takes in your language.\n+\t\t\teval_gettext \"$(\"error: unknown option for 'stash save': \\$option\n+       To provide a message, use git stash save -- '\\$option'\")\"; echo\n \t\t\tusage\n \t\t\t;;\n \t\t*)\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150677","messageId":"1284472340-7049-10-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 09/20] gettextize: git-stash drop_stash say/die messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:09Z","receivedAt":"2010-09-14T13:52:09Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the say/die eval_gettext messages in the drop_stash\nfunction. Since making these translatable would result in a long line\nI've wrapped this into two lines.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-stash.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 63885a3..36d821b 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -440,7 +440,8 @@ drop_stash () {\n \tassert_stash_ref \"$@\"\n \n \tgit reflog delete --updateref --rewrite \"${REV}\" &&\n-\t\tsay \"Dropped ${REV} ($s)\" || die \"${REV}: Could not drop stash entry\"\n+\t\tsay \"$(eval_gettext \"Dropped \\${REV} (\\$s)\")\" ||\n+\t\tdie \"$(eval_gettext \"\\${REV}: Could not drop stash entry\")\"\n \n \t# clear_stash if we just dropped the last stash entry\n \tgit rev-parse --verify \"$ref_stash@{0}\" > /dev/null 2>&1 || clear_stash\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150691","messageId":"1284472340-7049-11-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 10/20] gettextize: git-bisect add git-sh-i18n","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:10Z","receivedAt":"2010-09-14T13:52:10Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 6e2acb8..d0d95f6 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -28,6 +28,7 @@ Please use \"git help bisect\" to get the full man page.'\n \n OPTIONS_SPEC=\n . git-sh-setup\n+. git-sh-i18n\n require_work_tree\n \n _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150681","messageId":"1284472340-7049-12-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 11/20] gettextize: git-bisect gettext + echo message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:11Z","receivedAt":"2010-09-14T13:52:11Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex d0d95f6..1274f11 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -306,7 +306,7 @@ bisect_visualize() {\n \n bisect_reset() {\n \ttest -s \"$GIT_DIR/BISECT_START\" || {\n-\t\techo \"We are not bisecting.\"\n+\t\tgettext \"We are not bisecting.\"; echo\n \t\treturn\n \t}\n \tcase \"$#\" in\n@@ -406,7 +406,7 @@ bisect_run () {\n       fi\n \n       if sane_grep \"is the first bad commit\" \"$GIT_DIR/BISECT_RUN\" > /dev/null; then\n-\t  echo \"bisect run success\"\n+\t  gettext \"bisect run success\"; echo\n \t  exit 0;\n       fi\n \n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150682","messageId":"1284472340-7049-13-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 12/20] gettextize: git-bisect echo + gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:12Z","receivedAt":"2010-09-14T13:52:12Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 1274f11..4920878 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -36,7 +36,7 @@ _x40=\"$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40\"\n \n bisect_autostart() {\n \ttest -s \"$GIT_DIR/BISECT_START\" || {\n-\t\techo >&2 'You need to start by \"git bisect start\"'\n+\t\techo >&2 \"$(gettext \"You need to start by \\\"git bisect start\\\"\")\"\n \t\tif test -t 0\n \t\tthen\n \t\t\techo >&2 -n 'Do you want me to do it for you [Y/n]? '\n@@ -239,7 +239,7 @@ bisect_next_check() {\n \tt,,good)\n \t\t# have bad but not good.  we could bisect although\n \t\t# this is less optimum.\n-\t\techo >&2 'Warning: bisecting only with a bad commit.'\n+\t\techo >&2 \"$(gettext \"Warning: bisecting only with a bad commit.\")\"\n \t\tif test -t 0\n \t\tthen\n \t\t\tprintf >&2 'Are you sure [Y/n]? '\n@@ -395,7 +395,7 @@ bisect_run () {\n \n       if sane_grep \"first bad commit could be any of\" \"$GIT_DIR/BISECT_RUN\" \\\n \t\t> /dev/null; then\n-\t  echo >&2 \"bisect run cannot continue any more\"\n+\t  echo >&2 \"$(gettext \"bisect run cannot continue any more\")\"\n \t  exit $res\n       fi\n \n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150684","messageId":"1284472340-7049-14-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 13/20] gettextize: git-bisect echo + eval_gettext message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:13Z","receivedAt":"2010-09-14T13:52:13Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 4920878..c294819 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -400,8 +400,8 @@ bisect_run () {\n       fi\n \n       if [ $res -ne 0 ]; then\n-\t  echo >&2 \"bisect run failed:\"\n-\t  echo >&2 \"'bisect_state $state' exited with error code $res\"\n+\t  echo >&2 \"$(eval_gettext \"bisect run failed:\n+'bisect_state \\$state' exited with error code \\$res\")\"\n \t  exit $res\n       fi\n \n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150683","messageId":"1284472340-7049-15-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 14/20] gettextize: git-bisect die + gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:14Z","receivedAt":"2010-09-14T13:52:14Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |   14 +++++++-------\n 1 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex c294819..31ca97c 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -58,7 +58,7 @@ bisect_start() {\n \t#\n \thead=$(GIT_DIR=\"$GIT_DIR\" git symbolic-ref -q HEAD) ||\n \thead=$(GIT_DIR=\"$GIT_DIR\" git rev-parse --verify HEAD) ||\n-\tdie \"Bad HEAD - I need a HEAD\"\n+\tdie \"$(gettext \"Bad HEAD - I need a HEAD\")\"\n \n \t#\n \t# Check if we are bisecting.\n@@ -77,11 +77,11 @@ bisect_start() {\n \t\t\t# cogito usage, and cogito users should understand\n \t\t\t# it relates to cg-seek.\n \t\t\t[ -s \"$GIT_DIR/head-name\" ] &&\n-\t\t\t\tdie \"won't bisect on seeked tree\"\n+\t\t\t\tdie \"$(gettext \"won't bisect on seeked tree\")\"\n \t\t\tstart_head=\"${head#refs/heads/}\"\n \t\t\t;;\n \t\t*)\n-\t\t\tdie \"Bad HEAD - strange symbolic ref\"\n+\t\t\tdie \"$(gettext \"Bad HEAD - strange symbolic ref\")\"\n \t\t\t;;\n \t\tesac\n \tfi\n@@ -198,10 +198,10 @@ bisect_state() {\n \tstate=$1\n \tcase \"$#,$state\" in\n \t0,*)\n-\t\tdie \"Please call 'bisect_state' with at least one argument.\" ;;\n+\t\tdie \"$(gettext \"Please call 'bisect_state' with at least one argument.\")\" ;;\n \t1,bad|1,good|1,skip)\n \t\trev=$(git rev-parse --verify HEAD) ||\n-\t\t\tdie \"Bad rev input: HEAD\"\n+\t\t\tdie \"$(gettext \"Bad rev input: HEAD\")\"\n \t\tbisect_write \"$state\" \"$rev\"\n \t\tcheck_expected_revs \"$rev\" ;;\n \t2,bad|*,good|*,skip)\n@@ -216,7 +216,7 @@ bisect_state() {\n \t\teval \"$eval\"\n \t\tcheck_expected_revs \"$@\" ;;\n \t*,bad)\n-\t\tdie \"'git bisect bad' can take only one argument.\" ;;\n+\t\tdie \"$(gettext \"'git bisect bad' can take only one argument.\")\" ;;\n \t*)\n \t\tusage ;;\n \tesac\n@@ -355,7 +355,7 @@ bisect_replay () {\n \t\tgood|bad|skip)\n \t\t\tbisect_write \"$command\" \"$rev\" ;;\n \t\t*)\n-\t\t\tdie \"?? what are you talking about?\" ;;\n+\t\t\tdie \"$(gettext \"?? what are you talking about?\")\" ;;\n \t\tesac\n \tdone <\"$1\"\n \tbisect_auto_next\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150685","messageId":"1284472340-7049-16-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 15/20] gettextize: git-bisect die + eval_gettext messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:15Z","receivedAt":"2010-09-14T13:52:15Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 31ca97c..f715e84 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -111,7 +111,7 @@ bisect_start() {\n \t    *)\n \t\trev=$(git rev-parse -q --verify \"$arg^{commit}\") || {\n \t\t    test $has_double_dash -eq 1 &&\n-\t\t        die \"'$arg' does not appear to be a valid revision\"\n+\t\t        die \"$(eval_gettext \"'\\$arg' does not appear to be a valid revision\")\"\n \t\t    break\n \t\t}\n \t\tcase $bad_seen in\n@@ -156,7 +156,7 @@ bisect_write() {\n \tcase \"$state\" in\n \t\tbad)\t\ttag=\"$state\" ;;\n \t\tgood|skip)\ttag=\"$state\"-\"$rev\" ;;\n-\t\t*)\t\tdie \"Bad bisect_write argument: $state\" ;;\n+\t\t*)\t\tdie \"$(eval_gettext \"Bad bisect_write argument: \\$state\")\" ;;\n \tesac\n \tgit update-ref \"refs/bisect/$tag\" \"$rev\" || exit\n \techo \"# $state: $(git show-branch $rev)\" >>\"$GIT_DIR/BISECT_LOG\"\n@@ -184,7 +184,7 @@ bisect_skip() {\n \tdo\n \t    case \"$arg\" in\n             *..*)\n-                revs=$(git rev-list \"$arg\") || die \"Bad rev input: $arg\" ;;\n+                revs=$(git rev-list \"$arg\") || die \"$(eval_gettext \"Bad rev input: \\$arg\")\" ;;\n             *)\n                 revs=$(git rev-parse --sq-quote \"$arg\") ;;\n \t    esac\n@@ -210,7 +210,7 @@ bisect_state() {\n \t\tfor rev in \"$@\"\n \t\tdo\n \t\t\tsha=$(git rev-parse --verify \"$rev^{commit}\") ||\n-\t\t\t\tdie \"Bad rev input: $rev\"\n+\t\t\t\tdie \"$(eval_gettext \"Bad rev input: \\$rev\")\"\n \t\t\teval=\"$eval bisect_write '$state' '$sha'; \"\n \t\tdone\n \t\teval \"$eval\"\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150693","messageId":"1284472340-7049-17-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 16/20] gettextize: git-bisect bisect_run + $@ messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:16Z","receivedAt":"2010-09-14T13:52:16Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize bisect_run messages that use the $@ variable. Since it's\nsubroutine local we have to provide an alias for it for eval_gettext.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |    7 ++++---\n 1 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex f715e84..3b10ce6 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -366,14 +366,15 @@ bisect_run () {\n \n     while true\n     do\n-      echo \"running $@\"\n+      command=\"$@\"\n+      eval_gettext \"running \\$command\"; echo\n       \"$@\"\n       res=$?\n \n       # Check for really bad run error.\n       if [ $res -lt 0 -o $res -ge 128 ]; then\n-\t  echo >&2 \"bisect run failed:\"\n-\t  echo >&2 \"exit code $res from '$@' is < 0 or >= 128\"\n+\t  echo >&2 \"$(eval_gettext \"bisect run failed:\n+exit code \\$res from '\\$command' is < 0 or >= 128\")\"\n \t  exit $res\n       fi\n \n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150692","messageId":"1284472340-7049-18-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 17/20] gettextize: git-bisect bisect_reset + $1 messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:17Z","receivedAt":"2010-09-14T13:52:17Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"ettextize bisect_reset messages that use the $1 variable. Since it's\nsubroutine local we have to provide an alias for it for eval_gettext.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |    6 ++++--\n 1 files changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 3b10ce6..64c6b81 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -311,8 +311,10 @@ bisect_reset() {\n \t}\n \tcase \"$#\" in\n \t0) branch=$(cat \"$GIT_DIR/BISECT_START\") ;;\n-\t1) git rev-parse --quiet --verify \"$1^{commit}\" > /dev/null ||\n-\t       die \"'$1' is not a valid commit\"\n+\t1) git rev-parse --quiet --verify \"$1^{commit}\" > /dev/null || {\n+\t       invalid=\"$1\"\n+\t       die \"$(eval_gettext \"'\\$invalid' is not a valid commit\")\"\n+\t   }\n \t   branch=\"$1\" ;;\n \t*)\n \t    usage ;;\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150686","messageId":"1284472340-7049-19-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 18/20] gettextize: git-bisect bisect_replay + $1 messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:18Z","receivedAt":"2010-09-14T13:52:18Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize bisect_replay messages that use the $1 variable. Since it's\nsubroutine local we have to provide an alias for it for eval_gettext.\n\nSince I was doing that anyway I've changed all other uses of $1\nvariable to use the alias variable for clarity.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |    5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 64c6b81..f3162d6 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -341,7 +341,8 @@ bisect_clean_state() {\n }\n \n bisect_replay () {\n-\ttest -r \"$1\" || die \"cannot read $1 for replaying\"\n+\tfile=\"$1\"\n+\ttest -r \"$file\" || die \"$(eval_gettext \"cannot read \\$file for replaying\")\"\n \tbisect_reset\n \twhile read git bisect command rev\n \tdo\n@@ -359,7 +360,7 @@ bisect_replay () {\n \t\t*)\n \t\t\tdie \"$(gettext \"?? what are you talking about?\")\" ;;\n \t\tesac\n-\tdone <\"$1\"\n+\tdone <\"$file\"\n \tbisect_auto_next\n }\n \n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150688","messageId":"1284472340-7049-20-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 19/20] gettextize: git-bisect [Y/n] messages","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:19Z","receivedAt":"2010-09-14T13:52:19Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the [Y/n] questions git-bisect presents, and leave a note\nin a TRANSLATORS comment explaining that translators have to preserve\na mention of the Y/n characters since the program will expect them,\nand not their localized equivalents.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |   10 ++++++++--\n 1 files changed, 8 insertions(+), 2 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex f3162d6..b130129 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -39,7 +39,10 @@ bisect_autostart() {\n \t\techo >&2 \"$(gettext \"You need to start by \\\"git bisect start\\\"\")\"\n \t\tif test -t 0\n \t\tthen\n-\t\t\techo >&2 -n 'Do you want me to do it for you [Y/n]? '\n+\t\t\t# TRANSLATORS: Make sure to include [Y] and [n] in your\n+\t\t\t# translation. The program will only accept English input\n+\t\t\t# at this point.\n+\t\t\techo >&2 -n \"$(gettext \"Do you want me to do it for you [Y/n]? \")\"\n \t\t\tread yesno\n \t\t\tcase \"$yesno\" in\n \t\t\t[Nn]*)\n@@ -242,7 +245,10 @@ bisect_next_check() {\n \t\techo >&2 \"$(gettext \"Warning: bisecting only with a bad commit.\")\"\n \t\tif test -t 0\n \t\tthen\n-\t\t\tprintf >&2 'Are you sure [Y/n]? '\n+\t\t\t# TRANSLATORS: Make sure to include [Y] and [n] in your\n+\t\t\t# translation. The program will only accept English input\n+\t\t\t# at this point.\n+\t\t\tprintf >&2 \"$(gettext \"Are you sure [Y/n]? \")\"\n \t\t\tread yesno\n \t\t\tcase \"$yesno\" in [Nn]*) exit 1 ;; esac\n \t\tfi\n-- \n1.7.3.rc1.234.g8dc15\n"},{"id":"150687","messageId":"1284472340-7049-21-git-send-email-avarab@gmail.com","threadId":"25100","inReplyTo":"1284472340-7049-1-git-send-email-avarab@gmail.com","subject":"[PATCH/RFC 20/20] gettextize: git-bisect bisect_next_check \"You need to\" message","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-09-14T13:52:20Z","receivedAt":"2010-09-14T13:52:20Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Gettextize the \"You need to start by\" message in\nbisect_next_check. This message assembled English output by hand so it\nneeded to be split up to make it translatable.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-bisect.sh |   19 ++++++++++---------\n 1 files changed, 10 insertions(+), 9 deletions(-)\n\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex b130129..b5836dd 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -255,15 +255,16 @@ bisect_next_check() {\n \t\t: bisect without good...\n \t\t;;\n \t*)\n-\t\tTHEN=''\n-\t\ttest -s \"$GIT_DIR/BISECT_START\" || {\n-\t\t\techo >&2 'You need to start by \"git bisect start\".'\n-\t\t\tTHEN='then '\n-\t\t}\n-\t\techo >&2 'You '$THEN'need to give me at least one good' \\\n-\t\t\t'and one bad revisions.'\n-\t\techo >&2 '(You can use \"git bisect bad\" and' \\\n-\t\t\t'\"git bisect good\" for that.)'\n+\n+\t\tif test -s \"$GIT_DIR/BISECT_START\"\n+\t\tthen\n+\t\t\techo >&2 \"$(gettext \"You need to give me at least one good and one bad revisions.\n+(You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\")\"\n+\t\telse\n+\t\t\techo >&2 \"$(gettext \"You need to start by \\\"git bisect start\\\".\n+You then need to give me at least one good and one bad revisions.\n+(You can use \\\"git bisect bad\\\" and \\\"git bisect good\\\" for that.)\")\"\n+\t\tfi\n \t\texit 1 ;;\n \tesac\n }\n-- \n1.7.3.rc1.234.g8dc15\n"}]}