{"thread":{"id":"20737","subject":"[PATCH] git-bisect: call the found commit \"*the* first bad commit\"","startedAt":"2009-08-26T08:38:50Z","lastAt":"2009-08-28T05:31:12Z","messageCount":6,"participants":["Nanako Shiraishi","Junio C Hamano","Johannes Schindelin","Alex Riesen","Jeff King","Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"121774","messageId":"20090826173850.6117@nanako3.lavabit.com","threadId":"20737","inReplyTo":null,"subject":"[PATCH] git-bisect: call the found commit \"*the* first bad commit\"","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-08-26T08:38:50Z","receivedAt":"2009-08-26T08:38:50Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":".. as we learned in the school ;-)\n\nSigned-off-by: Nanako Shiraishi \n---\n bisect.c | 2 +-\n git-bisect.sh | 2 +-\n t/t6030-bisect-porcelain.sh | 18 +++++++++---------\n 3 files changed, 11 insertions(+), 11 deletions(-)\n\ndiff --git a/bisect.c b/bisect.c\nindex 7f20acb..dc18db8 100644\n--- a/bisect.c\n+++ b/bisect.c\n@@ -991,7 +991,7 @@ int bisect_next_all(const char *prefix)\n \n \tif (!hashcmp(bisect_rev, current_bad_sha1)) {\n \t\texit_if_skipped_commits(tried, current_bad_sha1);\n-\t\tprintf(\"%s is first bad commit\\n\", bisect_rev_hex);\n+\t\tprintf(\"%s is the first bad commit\\n\", bisect_rev_hex);\n \t\tshow_diff_tree(prefix, revs.commits->item);\n \t\t/* This means the bisection process succeeded. */\n \t\texit(10);\ndiff --git a/git-bisect.sh b/git-bisect.sh\nindex 8969553..6f6f039 100755\n--- a/git-bisect.sh\n+++ b/git-bisect.sh\n@@ -405,7 +405,7 @@ bisect_run () {\n \t exit $res\n fi\n \n- if grep \"is first bad commit\" \"$GIT_DIR/BISECT_RUN\" > /dev/null; then\n+ if grep \"is the first bad commit\" \"$GIT_DIR/BISECT_RUN\" > /dev/null; then\n \t echo \"bisect run success\"\n \t exit 0;\n fi\ndiff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh\nindex 1315bab..def397c 100755\n--- a/t/t6030-bisect-porcelain.sh\n+++ b/t/t6030-bisect-porcelain.sh\n@@ -175,7 +175,7 @@ test_expect_success 'bisect skip: successfull result' '\n \tgit bisect start $HASH4 $HASH1 &&\n \tgit bisect skip &&\n \tgit bisect bad > my_bisect_log.txt &&\n-\tgrep \"$HASH2 is first bad commit\" my_bisect_log.txt &&\n+\tgrep \"$HASH2 is the first bad commit\" my_bisect_log.txt &&\n \tgit bisect reset\n '\n \n@@ -261,7 +261,7 @@ test_expect_success \\\n git bisect good $HASH1 &&\n git bisect bad $HASH4 &&\n git bisect run ./test_script.sh > my_bisect_log.txt &&\n- grep \"$HASH3 is first bad commit\" my_bisect_log.txt &&\n+ grep \"$HASH3 is the first bad commit\" my_bisect_log.txt &&\n git bisect reset'\n \n # We want to automatically find the commit that\n@@ -274,7 +274,7 @@ test_expect_success \\\n chmod +x test_script.sh &&\n git bisect start $HASH4 $HASH1 &&\n git bisect run ./test_script.sh > my_bisect_log.txt &&\n- grep \"$HASH4 is first bad commit\" my_bisect_log.txt &&\n+ grep \"$HASH4 is the first bad commit\" my_bisect_log.txt &&\n git bisect reset'\n \n # $HASH1 is good, $HASH5 is bad, we skip $HASH3\n@@ -287,14 +287,14 @@ test_expect_success 'bisect skip: add line and then a new test' '\n \tgit bisect start $HASH5 $HASH1 &&\n \tgit bisect skip &&\n \tgit bisect good > my_bisect_log.txt &&\n-\tgrep \"$HASH5 is first bad commit\" my_bisect_log.txt &&\n+\tgrep \"$HASH5 is the first bad commit\" my_bisect_log.txt &&\n \tgit bisect log > log_to_replay.txt &&\n \tgit bisect reset\n '\n \n test_expect_success 'bisect skip and bisect replay' '\n \tgit bisect replay log_to_replay.txt > my_bisect_log.txt &&\n-\tgrep \"$HASH5 is first bad commit\" my_bisect_log.txt &&\n+\tgrep \"$HASH5 is the first bad commit\" my_bisect_log.txt &&\n \tgit bisect reset\n '\n \n@@ -335,7 +335,7 @@ test_expect_success 'bisect run & skip: find first bad' '\n \tchmod +x test_script.sh &&\n \tgit bisect start $HASH7 $HASH1 &&\n \tgit bisect run ./test_script.sh > my_bisect_log.txt &&\n-\tgrep \"$HASH6 is first bad commit\" my_bisect_log.txt\n+\tgrep \"$HASH6 is the first bad commit\" my_bisect_log.txt\n '\n \n test_expect_success 'bisect skip only one range' '\n@@ -385,7 +385,7 @@ test_expect_success 'bisect does not create a \"bisect\" branch' '\n \trev_hash6=$(git rev-parse --verify HEAD) &&\n \ttest \"$rev_hash6\" = \"$HASH6\" &&\n \tgit bisect good > my_bisect_log.txt &&\n-\tgrep \"$HASH7 is first bad commit\" my_bisect_log.txt &&\n+\tgrep \"$HASH7 is the first bad commit\" my_bisect_log.txt &&\n \tgit bisect reset &&\n \trev_hash6=$(git rev-parse --verify bisect) &&\n \ttest \"$rev_hash6\" = \"$HASH6\" &&\n@@ -534,7 +534,7 @@ test_expect_success 'restricting bisection on one dir' '\n \tpara1=$(git rev-parse --verify HEAD) &&\n \ttest \"$para1\" = \"$PARA_HASH1\" &&\n \tgit bisect bad > my_bisect_log.txt &&\n-\tgrep \"$PARA_HASH1 is first bad commit\" my_bisect_log.txt\n+\tgrep \"$PARA_HASH1 is the first bad commit\" my_bisect_log.txt\n '\n \n test_expect_success 'restricting bisection on one dir and a file' '\n@@ -552,7 +552,7 @@ test_expect_success 'restricting bisection on one dir and a file' '\n \tpara1=$(git rev-parse --verify HEAD) &&\n \ttest \"$para1\" = \"$PARA_HASH1\" &&\n \tgit bisect good > my_bisect_log.txt &&\n-\tgrep \"$PARA_HASH4 is first bad commit\" my_bisect_log.txt\n+\tgrep \"$PARA_HASH4 is the first bad commit\" my_bisect_log.txt\n '\n \n test_expect_success 'skipping away from skipped commit' '\n-- \n1.6.4.1\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"121782","messageId":"7vfxbfeyh5.fsf@alter.siamese.dyndns.org","threadId":"20737","inReplyTo":"20090826173850.6117@nanako3.lavabit.com","subject":"Re: [PATCH] git-bisect: call the found commit \"*the* first bad commit\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-08-26T09:05:58Z","receivedAt":"2009-08-26T09:05:58Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> .. as we learned in the school ;-)\n\nThanks.\n\nIs it \"learned in school\", or do you also need \"*the*\" there?\n\n;-)\n"},{"id":"121790","messageId":"alpine.DEB.1.00.0908261207400.4713@intel-tinevez-2-302","threadId":"20737","inReplyTo":"7vfxbfeyh5.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] git-bisect: call the found commit \"*the* first bad commit\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-08-26T10:08:11Z","receivedAt":"2009-08-26T10:08:11Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 26 Aug 2009, Junio C Hamano wrote:\n\n> Nanako Shiraishi writes:\n> \n> > .. as we learned in the school ;-)\n> \n> Thanks.\n> \n> Is it \"learned in school\", or do you also need \"*the*\" there?\n> \n> ;-)\n\nWell, I learnt at school that it is \"learnt\" and \"at school\"...\n\ndouble ;-)\n\nCiao,\nDscho\n"},{"id":"121795","messageId":"81b0412b0908260510nd69738axe8cd4e8fb3b63d@mail.gmail.com","threadId":"20737","inReplyTo":"alpine.DEB.1.00.0908261207400.4713@intel-tinevez-2-302","subject":"Re: [PATCH] git-bisect: call the found commit \"*the* first bad commit\"","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2009-08-26T12:10:00Z","receivedAt":"2009-08-26T12:10:00Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On Wed, Aug 26, 2009 at 12:08, Johannes\nSchindelin wrote:\n> On Wed, 26 Aug 2009, Junio C Hamano wrote:\n>> Nanako Shiraishi writes:\n>>\n>> > .. as we learned in the school ;-)\n>>\n>> Thanks.\n>>\n>> Is it \"learned in school\", or do you also need \"*the*\" there?\n>>\n>> ;-)\n>\n> Well, I learnt at school that it is \"learnt\" and \"at school\"...\n>\n> double ;-)\n\nThere is not one native speaker in this discussion, BTW :)\n\nhttp://www.thefreedictionary.com/learn\nhttp://www.thefreedictionary.com/school (look for American\nin \"Translation\")\n"},{"id":"121807","messageId":"20090826152911.GA32741@coredump.intra.peff.net","threadId":"20737","inReplyTo":"alpine.DEB.1.00.0908261207400.4713@intel-tinevez-2-302","subject":"Re: [PATCH] git-bisect: call the found commit \"*the* first bad commit\"","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-08-26T15:29:12Z","receivedAt":"2009-08-26T15:29:12Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Aug 26, 2009 at 12:08:11PM +0200, Johannes Schindelin wrote:\n\n> Well, I learnt at school that it is \"learnt\" and \"at school\"...\n> \n> double ;-)\n\nBloody Europeans. ;)\n\n-Peff\n"},{"id":"121974","messageId":"200908280731.12827.chriscool@tuxfamily.org","threadId":"20737","inReplyTo":"20090826173850.6117@nanako3.lavabit.com","subject":"Re: [PATCH] git-bisect: call the found commit \"*the* first bad commit\"","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2009-08-28T05:31:12Z","receivedAt":"2009-08-28T05:31:12Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Wednesday 26 August 2009, Nanako Shiraishi wrote:\n> .. as we learned in the school ;-)\n>\n> Signed-off-by: Nanako Shiraishi \n> ---\n> bisect.c | 2 +-\n> git-bisect.sh | 2 +-\n> t/t6030-bisect-porcelain.sh | 18 +++++++++---------\n> 3 files changed, 11 insertions(+), 11 deletions(-)\n>\n> diff --git a/bisect.c b/bisect.c\n> index 7f20acb..dc18db8 100644\n> --- a/bisect.c\n> +++ b/bisect.c\n> @@ -991,7 +991,7 @@ int bisect_next_all(const char *prefix)\n>\n> \tif (!hashcmp(bisect_rev, current_bad_sha1)) {\n> \t\texit_if_skipped_commits(tried, current_bad_sha1);\n> -\t\tprintf(\"%s is first bad commit\\n\", bisect_rev_hex);\n> +\t\tprintf(\"%s is the first bad commit\\n\", bisect_rev_hex);\n> \t\tshow_diff_tree(prefix, revs.commits->item);\n> \t\t/* This means the bisection process succeeded. */\n> \t\texit(10);\n\nThanks, but I wonder if this could give the false impression that there can \nonly be one \"first bad commit\". Because it's possible that a bug appears in \none commit say A, then get fixed in another one say B, and eventually \nreappears in a third one say C. So if the bisection range contains all \nthese commits, the result from bisecting could be A or C.\n\nBest regards,\nChristian.\n"}]}