{"thread":{"id":"23975","subject":"[PATCH 4/5] t/t7006: ignore return status of shell's unset builtin","startedAt":"2010-06-02T00:13:39Z","lastAt":"2010-08-18T02:37:26Z","messageCount":31,"participants":["Brandon Casey","Jonathan Nieder","Sverre Rabbelier","Johannes Sixt","Ævar Arnfjörð Bjarmason","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"142744","messageId":"Wt_M4qptcPdpY0Q3jqUbfIk6yMCN9Ja5RCtRUsADK5OJGrz7R_Cq1oGpeQoN7A9uCvw38jm63Jo@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":null,"subject":"[PATCH 0/5] miscellaneous test suite fixes","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T00:13:39Z","receivedAt":"2010-06-02T00:13:39Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"Identified by testing on IRIX 6.5, Solaris 5.7, and 5.10\n\nBrandon Casey (5):\n t/t5800: skip if python version is older than 2.5\n git-request-pull.sh: remove -e switch to shell interpreter which\n breaks ksh\n t/t5150: remove space from sed script\n t/t7006: ignore return status of shell's unset builtin\n t/aggregate-results: accomodate systems with small max argument list\n length\n\n git-request-pull.sh | 2 +-\n t/Makefile | 4 +++-\n t/aggregate-results.sh | 2 +-\n t/t5150-request-pull.sh | 4 ++--\n t/t5800-remote-helpers.sh | 4 ++--\n t/t7006-pager.sh | 10 +++++-----\n t/test-lib.sh | 9 +++++++++\n 7 files changed, 23 insertions(+), 12 deletions(-)\n"},{"id":"142746","messageId":"Wt_M4qptcPdpY0Q3jqUbfCU_HpY9NEjqs9eujZFD2rsUj5HRo__oQm7EUCxzXu38mC0y-ilUA14@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfIk6yMCN9Ja5RCtRUsADK5OJGrz7R_Cq1oGpeQoN7A9uCvw38jm63Jo@cipher.nrlssc.navy.mil","subject":"[PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T00:13:40Z","receivedAt":"2010-06-02T00:13:40Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nThis test script depends on the git-remote-testgit python script. This\npython script makes use of the hashlib module which was released in python\nversion 2.5. So, add a new pre-requisite named PYTHON_2_5_OR_NEWER to\ntest-lib.sh and check for it in t5800.\n\nSigned-off-by: Brandon Casey \n---\n t/t5800-remote-helpers.sh | 4 ++--\n t/test-lib.sh | 9 +++++++++\n 2 files changed, 11 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh\nindex 75a0163..58f60ab 100755\n--- a/t/t5800-remote-helpers.sh\n+++ b/t/t5800-remote-helpers.sh\n@@ -7,9 +7,9 @@ test_description='Test remote-helper import and export commands'\n \n . ./test-lib.sh\n \n-if ! test_have_prereq PYTHON\n+if ! test_have_prereq PYTHON_2_5_OR_NEWER\n then\n-\tsay 'skipping git remote-testgit tests: requires Python support'\n+\tsay 'skipping git remote-testgit tests: requires Python 2.5 or newer'\n \ttest_done\n fi\n \ndiff --git a/t/test-lib.sh b/t/test-lib.sh\nindex 454880a..ce56e1c 100644\n--- a/t/test-lib.sh\n+++ b/t/test-lib.sh\n@@ -846,6 +846,15 @@ esac\n test -z \"$NO_PERL\" && test_set_prereq PERL\n test -z \"$NO_PYTHON\" && test_set_prereq PYTHON\n \n+if test_have_prereq PYTHON && \"$PYTHON_PATH\" -c '\n+import sys\n+if sys.hexversion < 0x02050000:\n+ sys.exit(1)\n+'\n+then\n+\ttest_set_prereq PYTHON_2_5_OR_NEWER\n+fi\n+\n # test whether the filesystem supports symbolic links\n ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS\n rm -f y\n-- \n1.6.6.2\n"},{"id":"142745","messageId":"Wt_M4qptcPdpY0Q3jqUbfP4zZEkPwPt44bpwlkuoHdyyNRTiITmTBE-eGA_-F-7NiaN6W4MRrlA@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfIk6yMCN9Ja5RCtRUsADK5OJGrz7R_Cq1oGpeQoN7A9uCvw38jm63Jo@cipher.nrlssc.navy.mil","subject":"[PATCH 2/5] git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T00:13:41Z","receivedAt":"2010-06-02T00:13:41Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nThe -e option causes the shell to exit immediately when a command exits\nwith a non-zero exit status. This does not seem to cause a problem for\nBash, but it does cause a problem for the Korn shell, like Solaris's\nxpg4/sh, whose unset utility returns non-zero if it is passed a variable\nname which was not previously set. When using xpg4/sh, git-request-pull\nexits while sourcing git-sh-setup since git-sh-setup tries to unset the\nCDPATH environment variable.\n\nWhen git-request-pull was originally written, it did not do any error\nchecking and it used this shell feature to exit when an error occurred.\nThis script now performs proper error checking and provides useful error\nmessages, so this -e option appears to be merely a historical artifact and\ncan be removed.\n\nKudos to Jonathan Nieder for introducing t5150 which exercises the\nrequest-pull code path.\n\nSigned-off-by: Brandon Casey \n---\n git-request-pull.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-request-pull.sh b/git-request-pull.sh\nindex 74238b0..6dfb885 100755\n--- a/git-request-pull.sh\n+++ b/git-request-pull.sh\n@@ -1,4 +1,4 @@\n-#!/bin/sh -e\n+#!/bin/sh\n # Copyright 2005, Ryan Anderson \n #\n # This file is licensed under the GPL v2, or a later version\n-- \n1.6.6.2\n"},{"id":"142743","messageId":"Wt_M4qptcPdpY0Q3jqUbfHdhdVVIWdBL2foeesc5htUYUB0CGsjKfyMiphDZSQ95SVoPotS07S0@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfIk6yMCN9Ja5RCtRUsADK5OJGrz7R_Cq1oGpeQoN7A9uCvw38jm63Jo@cipher.nrlssc.navy.mil","subject":"[PATCH 3/5] t/t5150: remove space from sed script","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T00:13:42Z","receivedAt":"2010-06-02T00:13:42Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nSolaris's xpg4/sed and IRIX's sed fail to parse these negated matching\nexpressions when the '!' is separated from the command that follows.\n\nSigned-off-by: Brandon Casey \n---\n t/t5150-request-pull.sh | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh\nindex 169d3ea..9cc0a42 100755\n--- a/t/t5150-request-pull.sh\n+++ b/t/t5150-request-pull.sh\n@@ -67,7 +67,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '\n \n \tcat <<-\\EOT >read-request.sed &&\n \t#!/bin/sed -nf\n-\t/ in the git repository at:$/! d\n+\t/ in the git repository at:$/!d\n \tn\n \t/^$/ n\n \ts/^[ \t]*\\(.*\\) \\([^ ]*\\)/please pull\\\n@@ -102,7 +102,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '\n \t/^ [a-zA-Z]/ n\n \t/^[a-zA-Z]* ([0-9]*):\\$/ n\n \t/^\\$/ N\n-\t/^\\n[a-zA-Z]* ([0-9]*):\\$/! {\n+\t/^\\n[a-zA-Z]* ([0-9]*):\\$/!{\n \t\ta\\\\\n \tSHORTLOG\n \t\tD\n-- \n1.6.6.2\n"},{"id":"142742","messageId":"Wt_M4qptcPdpY0Q3jqUbfMMZpuKZEHudj8tavRDS41LEhIuAY6Jac5ja0dD0ZRTTyKV_0v7MM6g@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfIk6yMCN9Ja5RCtRUsADK5OJGrz7R_Cq1oGpeQoN7A9uCvw38jm63Jo@cipher.nrlssc.navy.mil","subject":"[PATCH 4/5] t/t7006: ignore return status of shell's unset builtin","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T00:13:43Z","receivedAt":"2010-06-02T00:13:43Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nThe unset builtin of Solaris's xpg4/sh returns non-zero if it is passed a\nvariable name which was not previously set. Since the unset is not likely\nto fail, ignore it's return status.\n\nSigned-off-by: Brandon Casey \n---\n t/t7006-pager.sh | 10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t7006-pager.sh b/t/t7006-pager.sh\nindex 3bc7a2a..a82bfb1 100755\n--- a/t/t7006-pager.sh\n+++ b/t/t7006-pager.sh\n@@ -40,7 +40,7 @@ else\n fi\n \n test_expect_success 'setup' '\n-\tunset GIT_PAGER GIT_PAGER_IN_USE &&\n+\tunset GIT_PAGER GIT_PAGER_IN_USE\n \ttest_might_fail git config --unset core.pager &&\n \n \tPAGER=\"cat >paginated.out\" &&\n@@ -159,7 +159,7 @@ test_expect_success 'color when writing to a file intended for a pager' '\n '\n \n test_expect_success 'determine default pager' '\n-\tunset PAGER GIT_PAGER &&\n+\tunset PAGER GIT_PAGER\n \ttest_might_fail git config --unset core.pager ||\n \tcleanup_fail &&\n \n@@ -173,7 +173,7 @@ then\n fi\n \n test_expect_success SIMPLEPAGER 'default pager is used by default' '\n-\tunset PAGER GIT_PAGER &&\n+\tunset PAGER GIT_PAGER\n \ttest_might_fail git config --unset core.pager &&\n \trm -f default_pager_used ||\n \tcleanup_fail &&\n@@ -192,7 +192,7 @@ test_expect_success SIMPLEPAGER 'default pager is used by default' '\n '\n \n test_expect_success TTY 'PAGER overrides default pager' '\n-\tunset GIT_PAGER &&\n+\tunset GIT_PAGER\n \ttest_might_fail git config --unset core.pager &&\n \trm -f PAGER_used ||\n \tcleanup_fail &&\n@@ -204,7 +204,7 @@ test_expect_success TTY 'PAGER overrides default pager' '\n '\n \n test_expect_success TTY 'core.pager overrides PAGER' '\n-\tunset GIT_PAGER &&\n+\tunset GIT_PAGER\n \trm -f core.pager_used ||\n \tcleanup_fail &&\n \n-- \n1.6.6.2\n"},{"id":"142747","messageId":"Wt_M4qptcPdpY0Q3jqUbfAATps4JfgEDin2dv8LrDHm_Fo4KpNe5saysU1vbzrL2g3gt1PWHFQY@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfIk6yMCN9Ja5RCtRUsADK5OJGrz7R_Cq1oGpeQoN7A9uCvw38jm63Jo@cipher.nrlssc.navy.mil","subject":"[PATCH 5/5] t/aggregate-results: accomodate systems with small max argument list length","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T00:13:44Z","receivedAt":"2010-06-02T00:13:44Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nIRIX 6.5 has a default maximum argument list length of 20480. The file\nglob that is passed to aggregate-results currently exceeds this length, and\nso the script cannot run successfully. Work around this issue by passing\nthe file names in via the standard input rather than the argument list.\n\nSigned-off-by: Brandon Casey \n---\n t/Makefile | 4 +++-\n t/aggregate-results.sh | 2 +-\n 2 files changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/t/Makefile b/t/Makefile\nindex 25c559b..cd008a3 100644\n--- a/t/Makefile\n+++ b/t/Makefile\n@@ -35,7 +35,9 @@ aggregate-results-and-cleanup: $(T)\n \t$(MAKE) clean\n \n aggregate-results:\n-\t'$(SHELL_PATH_SQ)' ./aggregate-results.sh test-results/t*-*\n+\tfor f in test-results/t*-*; do \\\n+\t\techo \"$$f\"; \\\n+\tdone | '$(SHELL_PATH_SQ)' ./aggregate-results.sh\n \n # we can test NO_OPTIMIZE_COMMITS independently of LC_ALL\n full-svn-test:\ndiff --git a/t/aggregate-results.sh b/t/aggregate-results.sh\nindex d5bab75..d206b7c 100755\n--- a/t/aggregate-results.sh\n+++ b/t/aggregate-results.sh\n@@ -6,7 +6,7 @@ failed=0\n broken=0\n total=0\n \n-for file\n+while read file\n do\n \twhile read type value\n \tdo\n-- \n1.6.6.2\n"},{"id":"142758","messageId":"20100602041246.GA8245@progeny.tock","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfHdhdVVIWdBL2foeesc5htUYUB0CGsjKfyMiphDZSQ95SVoPotS07S0@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 3/5] t/t5150: remove space from sed script","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-06-02T04:12:46Z","receivedAt":"2010-06-02T04:12:46Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Brandon Casey wrote:\n\n> Solaris's xpg4/sed and IRIX's sed fail to parse these negated matching\n> expressions when the '!' is separated from the command that follows.\n> \n> Signed-off-by: Brandon Casey \n\nGood catch, thanks.\n\nAcked-by: Jonathan Nieder \n"},{"id":"142759","messageId":"20100602043046.GB8245@progeny.tock","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfP4zZEkPwPt44bpwlkuoHdyyNRTiITmTBE-eGA_-F-7NiaN6W4MRrlA@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 2/5] git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-06-02T04:30:46Z","receivedAt":"2010-06-02T04:30:46Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Brandon Casey wrote:\n\n> When git-request-pull was originally written, it did not do any error\n> checking and it used this shell feature to exit when an error occurred.\n> This script now performs proper error checking and provides useful error\n> messages, so this -e option appears to be merely a historical artifact and\n> can be removed.\n\nAlso, the MinGW port ignores -e on a #! line, so we should not rely on it.\n\n> --- a/git-request-pull.sh\n> +++ b/git-request-pull.sh\n> @@ -1,4 +1,4 @@\n> -#!/bin/sh -e\n> +#!/bin/sh\n\nTo maintain the old behavior, I think we would need something like\nthis:\n\n-- 8< --\nSubject: request-pull: more explicit error handling\n\ngit request-pull includes -e on its #! line to catch miscellaneous\nerrors, but most of the body of the script explicitly handles\nerrors. Finish the job so we can remove the -e.\n\nSuggested-by: Brandon Casey \nSigned-off-by: Jonathan Nieder \n---\ndiff --git a/git-request-pull.sh b/git-request-pull.sh\nindex 6dfb885..6fdea39 100755\n--- a/git-request-pull.sh\n+++ b/git-request-pull.sh\n@@ -70,10 +70,10 @@ git show -s --format='The following changes since commit %H:\n \n %s (%ci)\n \n-are available in the git repository at:' $baserev\n-echo \" $url $branch\"\n-echo\n+are available in the git repository at:' $baserev &&\n+echo \" $url $branch\" &&\n+echo &&\n \n-git shortlog ^$baserev $headrev\n-git diff -M --stat --summary $patch $merge_base..$headrev\n+git shortlog ^$baserev $headrev &&\n+git diff -M --stat --summary $patch $merge_base..$headrev || exit\n exit $status\n"},{"id":"142769","messageId":"20100602054737.GA9369@progeny.tock","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfMMZpuKZEHudj8tavRDS41LEhIuAY6Jac5ja0dD0ZRTTyKV_0v7MM6g@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 4/5] t/t7006: ignore return status of shell's unset builtin","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-06-02T05:47:37Z","receivedAt":"2010-06-02T05:47:37Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Brandon Casey wrote:\n\n> The unset builtin of Solaris's xpg4/sh returns non-zero if it is passed a\n> variable name which was not previously set.\n\nThis is historical ksh behavior (only changed in 2009-01-14) even if\nit violates SUSv2. It probably comes up on a lot of platforms.\nThanks.\n\nAcked-by: Jonathan Nieder \n"},{"id":"142785","messageId":"AANLkTinQrdJeTxoZ207kvv5R_3qUj5ocGgAlC22SQyOg@mail.gmail.com","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfCU_HpY9NEjqs9eujZFD2rsUj5HRo__oQm7EUCxzXu38mC0y-ilUA14@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-06-02T06:21:00Z","receivedAt":"2010-06-02T06:21:00Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Wed, Jun 2, 2010 at 02:13, Brandon Casey wrote:\n> This test script depends on the git-remote-testgit python script.  This\n> python script makes use of the hashlib module which was released in python\n> version 2.5.  So, add a new pre-requisite named PYTHON_2_5_OR_NEWER to\n> test-lib.sh and check for it in t5800.\n\nPerhaps instead we can change git-remote-testgit to do:\n\n\"try:\nimport hashlib\nexcept ImportError:\nimport ?? as hashlib\n\"\n\nOtoh, python 2.5 has been out for a while (and is in fact only\ndownloadable as a source-only release these days). To be exact, it was\nreleased on September 19, 2006.\n\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"142789","messageId":"4C05FC18.4090402@viscovery.net","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfCU_HpY9NEjqs9eujZFD2rsUj5HRo__oQm7EUCxzXu38mC0y-ilUA14@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-06-02T06:37:12Z","receivedAt":"2010-06-02T06:37:12Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 6/2/2010 2:13, schrieb Brandon Casey:\n> +if ! test_have_prereq PYTHON_2_5_OR_NEWER\n> then\n> +\tsay 'skipping git remote-testgit tests: requires Python 2.5 or newer'\n...\n> +++ b/t/test-lib.sh\n> +if test_have_prereq PYTHON && \"$PYTHON_PATH\" -c '\n> +import sys\n> +if sys.hexversion < 0x02050000:\n> + sys.exit(1)\n> +'\n> +then\n> +\ttest_set_prereq PYTHON_2_5_OR_NEWER\n> +fi\n\nPlease don't burden all test script invocations with this check when the\nresult is used in only one place.\n\n-- Hannes\n"},{"id":"142790","messageId":"4C05FD37.1080209@viscovery.net","threadId":"23975","inReplyTo":"Wt_M4qptcPdpY0Q3jqUbfMMZpuKZEHudj8tavRDS41LEhIuAY6Jac5ja0dD0ZRTTyKV_0v7MM6g@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 4/5] t/t7006: ignore return status of shell's unset builtin","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-06-02T06:41:59Z","receivedAt":"2010-06-02T06:41:59Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 6/2/2010 2:13, schrieb Brandon Casey:\n> test_expect_success 'setup' '\n> -\tunset GIT_PAGER GIT_PAGER_IN_USE &&\n> +\tunset GIT_PAGER GIT_PAGER_IN_USE\n\nMaybe we should terminate the line with ';' to document that it is a\ndeliberate choice that there is no '&&'?\n\nJust an idea...\n\n-- Hannes\n"},{"id":"142801","messageId":"AANLkTilMBZ_m71dPoH8mU6e9wfYybljV9bE2p_Bl9C0g@mail.gmail.com","threadId":"23975","inReplyTo":"AANLkTinQrdJeTxoZ207kvv5R_3qUj5ocGgAlC22SQyOg@mail.gmail.com","subject":"Re: [PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-06-02T09:33:27Z","receivedAt":"2010-06-02T09:33:27Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Wed, Jun 2, 2010 at 06:21, Sverre Rabbelier wrote:\n> Otoh, python 2.5 has been out for a while (and is in fact only\n> downloadable as a source-only release these days). To be exact, it was\n> released on September 19, 2006.\n\nAs a trivia: most of our Perl code is still 5.6 compatible. That'd be\nlike supporting Python 1.6 (or actually, 1.5.2, 1.6 came out half a\nyear after Perl 5.6).\n\nAnyway, dying in the program as you suggest seems like a better idea.\n"},{"id":"142818","messageId":"DuKPgjmjtglLvPhY13WXeTqBXfxpYQxJ0HN4KDdE6zz0PBeoa6gTbg@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"20100602043046.GB8245@progeny.tock","subject":"Re: [PATCH 2/5] git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T14:21:04Z","receivedAt":"2010-06-02T14:21:04Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"On 06/01/2010 11:30 PM, Jonathan Nieder wrote:\n> Brandon Casey wrote:\n> \n>> When git-request-pull was originally written, it did not do any error\n>> checking and it used this shell feature to exit when an error occurred.\n>> This script now performs proper error checking and provides useful error\n>> messages, so this -e option appears to be merely a historical artifact and\n>> can be removed.\n> \n> Also, the MinGW port ignores -e on a #! line, so we should not rely on it.\n> \n>> --- a/git-request-pull.sh\n>> +++ b/git-request-pull.sh\n>> @@ -1,4 +1,4 @@\n>> -#!/bin/sh -e\n>> +#!/bin/sh\n> \n> To maintain the old behavior, I think we would need something like\n> this:\n> \n> -- 8< --\n> Subject: request-pull: more explicit error handling\n\nworks for me.\n"},{"id":"142823","messageId":"meC0HM60UnAajjHuTX-y8qZO2Unmc9VZYk1ZAHZ86LlKSy4E9Rfc_w@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"AANLkTinQrdJeTxoZ207kvv5R_3qUj5ocGgAlC22SQyOg@mail.gmail.com","subject":"Re: [PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T14:44:26Z","receivedAt":"2010-06-02T14:44:26Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"On 06/02/2010 01:21 AM, Sverre Rabbelier wrote:\n> Heya,\n> \n> On Wed, Jun 2, 2010 at 02:13, Brandon Casey wrote:\n>> This test script depends on the git-remote-testgit python script. This\n>> python script makes use of the hashlib module which was released in python\n>> version 2.5. So, add a new pre-requisite named PYTHON_2_5_OR_NEWER to\n>> test-lib.sh and check for it in t5800.\n> \n> Perhaps instead we can change git-remote-testgit to do:\n> \n> \"try:\n> import hashlib\n> except ImportError:\n> import ?? as hashlib\n> \"\n\nI can only guess at what that does. :)\n\n> Otoh, python 2.5 has been out for a while (and is in fact only\n> downloadable as a source-only release these days). To be exact, it was\n> released on September 19, 2006.\n\nThat's only long in python years. :)\n\nRedHat's latest operating system still has version 2.4.3.\n\n-brandon\n"},{"id":"142821","messageId":"771D_fbE1nXD6XdR0EsexE96n7NZJ1WvuJ__1wNJTGHLKi4dsHGk0g@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"4C05FC18.4090402@viscovery.net","subject":"Re: [PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T14:46:14Z","receivedAt":"2010-06-02T14:46:14Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"On 06/02/2010 01:37 AM, Johannes Sixt wrote:\n> Am 6/2/2010 2:13, schrieb Brandon Casey:\n>> +if ! test_have_prereq PYTHON_2_5_OR_NEWER\n>> then\n>> +\tsay 'skipping git remote-testgit tests: requires Python 2.5 or newer'\n> ...\n>> +++ b/t/test-lib.sh\n>> +if test_have_prereq PYTHON && \"$PYTHON_PATH\" -c '\n>> +import sys\n>> +if sys.hexversion < 0x02050000:\n>> + sys.exit(1)\n>> +'\n>> +then\n>> +\ttest_set_prereq PYTHON_2_5_OR_NEWER\n>> +fi\n> \n> Please don't burden all test script invocations with this check when the\n> result is used in only one place.\n\nVery good point.\n"},{"id":"142820","messageId":"CdJJyxR1_KnpwZGt1HSeDymxbS1diQ_jjDxyygUO3WI@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"4C05FD37.1080209@viscovery.net","subject":"Re: [PATCH 4/5] t/t7006: ignore return status of shell's unset builtin","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T14:47:10Z","receivedAt":"2010-06-02T14:47:10Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"On 06/02/2010 01:41 AM, Johannes Sixt wrote:\n> Am 6/2/2010 2:13, schrieb Brandon Casey:\n>> test_expect_success 'setup' '\n>> -\tunset GIT_PAGER GIT_PAGER_IN_USE &&\n>> +\tunset GIT_PAGER GIT_PAGER_IN_USE\n> \n> Maybe we should terminate the line with ';' to document that it is a\n> deliberate choice that there is no '&&'?\n> \n> Just an idea...\n\nI like it.\n"},{"id":"142827","messageId":"ECbjGSsMA4ZIaSU1sgkRHSvxlxbZZwsEBdVFoyCTLeEuJTxU_EI8Xw@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"meC0HM60UnAajjHuTX-y8qZO2Unmc9VZYk1ZAHZ86LlKSy4E9Rfc_w@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Brandon Casey","fromEmail":"brandon.casey.ctr@nrlssc.navy.mil","sentAt":"2010-06-02T15:15:23Z","receivedAt":"2010-06-02T15:15:23Z","isPatch":true,"sender":{"key":"brandon.casey.ctr@nrlssc.navy.mil","avatar":null},"body":"On 06/02/2010 09:44 AM, Brandon Casey wrote:\n> On 06/02/2010 01:21 AM, Sverre Rabbelier wrote:\n>> Heya,\n>>\n>> On Wed, Jun 2, 2010 at 02:13, Brandon Casey wrote:\n>>> This test script depends on the git-remote-testgit python script. This\n>>> python script makes use of the hashlib module which was released in python\n>>> version 2.5. So, add a new pre-requisite named PYTHON_2_5_OR_NEWER to\n>>> test-lib.sh and check for it in t5800.\n>> Perhaps instead we can change git-remote-testgit to do:\n>>\n>> \"try:\n>> import hashlib\n>> except ImportError:\n>> import ?? as hashlib\n>> \"\n> \n> I can only guess at what that does. :)\n\nCorrection, I have no idea what that does.\n\nHere's the patch:\n\ndiff --git a/git-remote-testgit.py b/git-remote-testgit.py\nindex 9253922..1371497 100644\n--- a/git-remote-testgit.py\n+++ b/git-remote-testgit.py\n@@ -1,6 +1,9 @@\n #!/usr/bin/env python\n \n-import hashlib\n+try:\n+ import hashlib\n+except ImportError:\n+ import ?? as hashlib\n import sys\n import os\n sys.path.insert(0, os.getenv(\"GITPYTHONLIB\",\".\"))\n\n\n\nI get:\n\n File \"/git-remote-testgit\", line 6\n import ?? as hashlib\n ^\nSyntaxError: invalid syntax\n"},{"id":"142829","messageId":"6S2YIhGhiwzh6wTfvWh1Sm_3KoUNJkiAzJKJKLNpqo3MC4Z5besrsZ4fL9wiH35DJsX4cyCs7SM@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"CdJJyxR1_KnpwZGt1HSeDymxbS1diQ_jjDxyygUO3WI@cipher.nrlssc.navy.mil","subject":"[PATCH 4/5 v2] t/t7006: ignore return status of shell's unset builtin","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T15:32:26Z","receivedAt":"2010-06-02T15:32:26Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nThe unset builtin of Solaris's xpg4/sh returns non-zero if it is passed a\nvariable name which was not previously set. Since the unset is not likely\nto fail, ignore its return status, but add a semicolon as a clue that the\n'&&' was deliberately left off.\n\nSigned-off-by: Brandon Casey \n---\n t/t7006-pager.sh | 10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ndiff --git a/t/t7006-pager.sh b/t/t7006-pager.sh\nindex 3bc7a2a..a6f3677 100755\n--- a/t/t7006-pager.sh\n+++ b/t/t7006-pager.sh\n@@ -40,7 +40,7 @@ else\n fi\n \n test_expect_success 'setup' '\n-\tunset GIT_PAGER GIT_PAGER_IN_USE &&\n+\tunset GIT_PAGER GIT_PAGER_IN_USE;\n \ttest_might_fail git config --unset core.pager &&\n \n \tPAGER=\"cat >paginated.out\" &&\n@@ -159,7 +159,7 @@ test_expect_success 'color when writing to a file intended for a pager' '\n '\n \n test_expect_success 'determine default pager' '\n-\tunset PAGER GIT_PAGER &&\n+\tunset PAGER GIT_PAGER;\n \ttest_might_fail git config --unset core.pager ||\n \tcleanup_fail &&\n \n@@ -173,7 +173,7 @@ then\n fi\n \n test_expect_success SIMPLEPAGER 'default pager is used by default' '\n-\tunset PAGER GIT_PAGER &&\n+\tunset PAGER GIT_PAGER;\n \ttest_might_fail git config --unset core.pager &&\n \trm -f default_pager_used ||\n \tcleanup_fail &&\n@@ -192,7 +192,7 @@ test_expect_success SIMPLEPAGER 'default pager is used by default' '\n '\n \n test_expect_success TTY 'PAGER overrides default pager' '\n-\tunset GIT_PAGER &&\n+\tunset GIT_PAGER;\n \ttest_might_fail git config --unset core.pager &&\n \trm -f PAGER_used ||\n \tcleanup_fail &&\n@@ -204,7 +204,7 @@ test_expect_success TTY 'PAGER overrides default pager' '\n '\n \n test_expect_success TTY 'core.pager overrides PAGER' '\n-\tunset GIT_PAGER &&\n+\tunset GIT_PAGER;\n \trm -f core.pager_used ||\n \tcleanup_fail &&\n \n-- \n1.6.6.2\n"},{"id":"142831","messageId":"AANLkTilT3erRySKImnUxON1vOnNJyVOLjn4t4F4rCQTi@mail.gmail.com","threadId":"23975","inReplyTo":"ECbjGSsMA4ZIaSU1sgkRHSvxlxbZZwsEBdVFoyCTLeEuJTxU_EI8Xw@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-06-02T16:38:07Z","receivedAt":"2010-06-02T16:38:07Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Wed, Jun 2, 2010 at 17:15, Brandon Casey\n wrote:\n> Here's the patch:\n\nThat was not meant as a concrete suggestion :P. I meant that I did not\nknow what package is available in 2.4.x, so substitute it on the ??'s\n:P. The ? does not mean anything.\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"142832","messageId":"dXGk9a7-lm1qAglSI8NsQhYuDVlCEtaSib3p-Cl4u4I@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"AANLkTilT3erRySKImnUxON1vOnNJyVOLjn4t4F4rCQTi@mail.gmail.com","subject":"Re: [PATCH 1/5] t/t5800: skip if python version is older than 2.5","fromName":"Brandon Casey","fromEmail":"brandon.casey.ctr@nrlssc.navy.mil","sentAt":"2010-06-02T16:50:03Z","receivedAt":"2010-06-02T16:50:03Z","isPatch":true,"sender":{"key":"brandon.casey.ctr@nrlssc.navy.mil","avatar":null},"body":"On 06/02/2010 11:38 AM, Sverre Rabbelier wrote:\n> Heya,\n> \n> On Wed, Jun 2, 2010 at 17:15, Brandon Casey\n> wrote:\n>> Here's the patch:\n> \n> That was not meant as a concrete suggestion :P. I meant that I did not\n> know what package is available in 2.4.x, so substitute it on the ??'s\n> :P. The ? does not mean anything.\n> \n\nHa! That shows you how much python I know!\n\nHand, meet forehead.\n\n-b\n"},{"id":"142843","messageId":"injaoVtrfs7Li4aYBNxEQXkF9MAEkifYLJqrBJp5DqE7xic9MCOmsuM0PlcTeaONK62661_isOI@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"AANLkTinQrdJeTxoZ207kvv5R_3qUj5ocGgAlC22SQyOg@mail.gmail.com","subject":"test suite work-around for python 2.5 requirement","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T23:23:14Z","receivedAt":"2010-06-02T23:23:14Z","isPatch":false,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"On 06/02/2010 01:21 AM, Sverre Rabbelier wrote:\n> Heya,\n> \n> On Wed, Jun 2, 2010 at 02:13, Brandon Casey wrote:\n>> This test script depends on the git-remote-testgit python script. This\n>> python script makes use of the hashlib module which was released in python\n>> version 2.5. So, add a new pre-requisite named PYTHON_2_5_OR_NEWER to\n>> test-lib.sh and check for it in t5800.\n> \n> Perhaps instead we can change git-remote-testgit to do:\n> \n> \"try:\n> import hashlib\n> except ImportError:\n> import ?? as hashlib\n> \"\n\nHere's a work-around for the test suite until we figure out\nwhat ?? should be.\n\n[PATCH 1/2] Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS\n[PATCH 2/2] t/t5800: skip if python version is older than 2.5\n"},{"id":"142844","messageId":"injaoVtrfs7Li4aYBNxEQTEuVfA0su6k31mnsFSHfME7ANKbGtnFY8il0PxJbc0dX9uP-BWJKTk@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"AANLkTinQrdJeTxoZ207kvv5R_3qUj5ocGgAlC22SQyOg@mail.gmail.com","subject":"[PATCH 1/2] Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T23:23:15Z","receivedAt":"2010-06-02T23:23:15Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nThis allows the correct python to be used by the test suite.\n\nSigned-off-by: Brandon Casey \n---\n Makefile | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex d5d6565..7b5de0c 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1885,6 +1885,7 @@ GIT-CFLAGS: FORCE\n GIT-BUILD-OPTIONS: FORCE\n \t@echo SHELL_PATH=\\''$(subst ','\\'',$(SHELL_PATH_SQ))'\\' >$@\n \t@echo PERL_PATH=\\''$(subst ','\\'',$(PERL_PATH_SQ))'\\' >>$@\n+\t@echo PYTHON_PATH=\\''$(subst ','\\'',$(PYTHON_PATH_SQ))'\\' >>$@\n \t@echo TAR=\\''$(subst ','\\'',$(subst ','\\'',$(TAR)))'\\' >>$@\n \t@echo NO_CURL=\\''$(subst ','\\'',$(subst ','\\'',$(NO_CURL)))'\\' >>$@\n \t@echo NO_PERL=\\''$(subst ','\\'',$(subst ','\\'',$(NO_PERL)))'\\' >>$@\n-- \n1.6.6.2\n"},{"id":"142845","messageId":"injaoVtrfs7Li4aYBNxEQeawf3YbhxcYbL79Jvef2ML9502YRtjqEol2RVKBzXfH_PfbMep0lvU@cipher.nrlssc.navy.mil","threadId":"23975","inReplyTo":"AANLkTinQrdJeTxoZ207kvv5R_3qUj5ocGgAlC22SQyOg@mail.gmail.com","subject":"[PATCH 2/2] t/t5800: skip if python version is older than 2.5","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2010-06-02T23:23:16Z","receivedAt":"2010-06-02T23:23:16Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey \n\nThis test script depends on the git-remote-testgit python script. The\ngit-remote-testgit script makes use of the hashlib module which was\nreleased in python version 2.5. So, check the python version and skip this\ntest if it's too old.\n\nSigned-off-by: Brandon Casey \n---\n\n\nBy the way, I don't have python 2.5 or newer to test this. :p\n\n-brandon\n\n\n t/t5800-remote-helpers.sh | 8 ++++++--\n 1 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh\nindex 75a0163..2e5efe6 100755\n--- a/t/t5800-remote-helpers.sh\n+++ b/t/t5800-remote-helpers.sh\n@@ -7,9 +7,13 @@ test_description='Test remote-helper import and export commands'\n \n . ./test-lib.sh\n \n-if ! test_have_prereq PYTHON\n+if ! test_have_prereq PYTHON || ! \"$PYTHON_PATH\" -c '\n+import sys\n+if sys.hexversion < 0x02050000:\n+ sys.exit(1)\n+'\n then\n-\tsay 'skipping git remote-testgit tests: requires Python support'\n+\tsay 'skipping git remote-testgit tests: requires Python 2.5 or newer'\n \ttest_done\n fi\n \n-- \n1.6.6.2\n"},{"id":"142848","messageId":"7vpr099fay.fsf@alter.siamese.dyndns.org","threadId":"23975","inReplyTo":"DuKPgjmjtglLvPhY13WXeTqBXfxpYQxJ0HN4KDdE6zz0PBeoa6gTbg@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 2/5] git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-06-02T23:37:41Z","receivedAt":"2010-06-02T23:37:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Brandon Casey writes:\n\n> On 06/01/2010 11:30 PM, Jonathan Nieder wrote:\n>> Brandon Casey wrote:\n>> ...\n>> To maintain the old behavior, I think we would need something like\n>> this:\n>> \n>> -- 8< --\n>> Subject: request-pull: more explicit error handling\n>\n> works for me.\n\nWill squash into a single patch; thanks.\n"},{"id":"148314","messageId":"AANLkTimwNBAKwhKwsquDS4k3x0_iDo3rEyqFfhMcsb38@mail.gmail.com","threadId":"23975","inReplyTo":"injaoVtrfs7Li4aYBNxEQeawf3YbhxcYbL79Jvef2ML9502YRtjqEol2RVKBzXfH_PfbMep0lvU@cipher.nrlssc.navy.mil","subject":"Re: [PATCH 2/2] t/t5800: skip if python version is older than 2.5","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-08-17T23:15:46Z","receivedAt":"2010-08-17T23:15:46Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Wed, Jun 2, 2010 at 18:23, Brandon Casey wrote:\n> -if ! test_have_prereq PYTHON\n> +if ! test_have_prereq PYTHON || ! \"$PYTHON_PATH\" -c '\n> +import sys\n> +if sys.hexversion < 0x02050000:\n> +    sys.exit(1)\n> +'\n\nI just checkout out this revision, there is no PYTHON_PATH variable. So:\n\nsverre@laptop-sverre:~/code/git/t$ make t5800-remote-helpers.sh\n*** t5800-remote-helpers.sh ***\nt5800-remote-helpers.sh: line 10: : command not found\n* skipping git remote-testgit tests: requires Python 2.5 or newer\n* passed all 0 test(s)\n\nI'm not sure what is wrong here, but somehow the PYTHON_PATH variable\nis not propagated to the script?\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"148317","messageId":"20100817232838.GH2221@burratino","threadId":"23975","inReplyTo":"AANLkTimwNBAKwhKwsquDS4k3x0_iDo3rEyqFfhMcsb38@mail.gmail.com","subject":"Re: [PATCH 2/2] t/t5800: skip if python version is older than 2.5","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-17T23:28:38Z","receivedAt":"2010-08-17T23:28:38Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Sverre Rabbelier wrote:\n\n> sverre@laptop-sverre:~/code/git/t$ make t5800-remote-helpers.sh\n> *** t5800-remote-helpers.sh ***\n> t5800-remote-helpers.sh: line 10: : command not found\n> * skipping git remote-testgit tests: requires Python 2.5 or newer\n> * passed all 0 test(s)\n> \n> I'm not sure what is wrong here, but somehow the PYTHON_PATH variable\n> is not propagated to the script?\n\nHmm, what does your GIT-BUILD-OPTIONS say?\n"},{"id":"148318","messageId":"AANLkTim77g+z3KXyCOy4G-caCncyFa0FfqPMFatZnwLN@mail.gmail.com","threadId":"23975","inReplyTo":"20100817232838.GH2221@burratino","subject":"Re: [PATCH 2/2] t/t5800: skip if python version is older than 2.5","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-08-17T23:32:06Z","receivedAt":"2010-08-17T23:32:06Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Tue, Aug 17, 2010 at 18:28, Jonathan Nieder wrote:\n> Hmm, what does your GIT-BUILD-OPTIONS say?\n\nsverre@laptop-sverre:~/code/git$ cat GIT-BUILD-OPTIONS\nSHELL_PATH='/bin/sh'\nPERL_PATH='/usr/bin/perl'\nTAR='tar'\nNO_CURL=''\nNO_PERL=''\nNO_PYTHON=''\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"148319","messageId":"20100817233717.GJ2221@burratino","threadId":"23975","inReplyTo":"AANLkTim77g+z3KXyCOy4G-caCncyFa0FfqPMFatZnwLN@mail.gmail.com","subject":"Re: [PATCH 2/2] t/t5800: skip if python version is older than 2.5","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-17T23:37:17Z","receivedAt":"2010-08-17T23:37:17Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi again,\n\nSverre Rabbelier wrote:\n\n> sverre@laptop-sverre:~/code/git$ cat GIT-BUILD-OPTIONS\n> SHELL_PATH='/bin/sh'\n> PERL_PATH='/usr/bin/perl'\n> TAR='tar'\n> NO_CURL=''\n> NO_PERL=''\n> NO_PYTHON=''\n\nI see. Maybe this is fixed by v1.7.2-rc0~33^2~1 (Makefile: add\nPYTHON_PATH to GIT-BUILD-OPTIONS, 2010-06-09) from later in the\nsame series.\n"},{"id":"148327","messageId":"AANLkTim+YQHxkY6WWF4Yfo74jZnAE8ufdnabp9mneBgu@mail.gmail.com","threadId":"23975","inReplyTo":"20100817233717.GJ2221@burratino","subject":"Re: [PATCH 2/2] t/t5800: skip if python version is older than 2.5","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2010-08-18T00:10:49Z","receivedAt":"2010-08-18T00:10:49Z","isPatch":true,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Tue, Aug 17, 2010 at 18:37, Jonathan Nieder wrote:\n> I see.  Maybe this is fixed by v1.7.2-rc0~33^2~1 (Makefile: add\n> PYTHON_PATH to GIT-BUILD-OPTIONS, 2010-06-09) from later in the\n> same series.\n\nAh, correct. So that should have gone before this one. It works if I\ncheck out and build that one. Thanks.\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"148332","messageId":"AANLkTi=y5vr25cJMfV=7KisCB7R-s7YVonc-7QZemO0j@mail.gmail.com","threadId":"23975","inReplyTo":"AANLkTim+YQHxkY6WWF4Yfo74jZnAE8ufdnabp9mneBgu@mail.gmail.com","subject":"Re: [PATCH 2/2] t/t5800: skip if python version is older than 2.5","fromName":"Brandon Casey","fromEmail":"drafnel@gmail.com","sentAt":"2010-08-18T02:37:26Z","receivedAt":"2010-08-18T02:37:26Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"On Tue, Aug 17, 2010 at 7:10 PM, Sverre Rabbelier wrote:\n> Heya,\n>\n> On Tue, Aug 17, 2010 at 18:37, Jonathan Nieder wrote:\n>> I see.  Maybe this is fixed by v1.7.2-rc0~33^2~1 (Makefile: add\n>> PYTHON_PATH to GIT-BUILD-OPTIONS, 2010-06-09) from later in the\n>> same series.\n\nWell not actually the same series. If I recall correctly, the\noriginal version of\nthis 'skip if python vers...' patch was replaced by a resend of two patches and\none of them did the' propagate PYTHON_PATH to GIT-BUILD-OPTIONS' thing.\n\nI think Junio ended up fixing up the original patch by hand, and the PYTHON_PATH\nbit got dropped.\n\nLater on I resent it.\n\n> Ah, correct. So that should have gone before this one. It works if I\n> check out and build that one. Thanks.\n\nAlso, note that the test should complete successfully if run via 'make\ntest' since\nPYTHON_PATH is exported in the Makefile. That's why I didn't notice the\nflaw at first.\n\n-Brandon\n"}]}