# [PATCH] git-bisect: call the found commit "*the* first bad commit" 6 messages from 2009-08-26 to 2009-08-28. Participants: Nanako Shiraishi, Junio C Hamano, Johannes Schindelin, Alex Riesen, Jeff King, Christian Couder. Thread: https://gitlist.dev/t/20737 ## Nanako Shiraishi, 2009-08-26 08:38 Subject: [PATCH] git-bisect: call the found commit "*the* first bad commit" Message-ID: <20090826173850.6117@nanako3.lavabit.com> URL: https://gitlist.dev/e/20090826173850.6117%40nanako3.lavabit.com ``` .. as we learned in the school ;-) Signed-off-by: Nanako Shiraishi --- bisect.c | 2 +- git-bisect.sh | 2 +- t/t6030-bisect-porcelain.sh | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bisect.c b/bisect.c index 7f20acb..dc18db8 100644 --- a/bisect.c +++ b/bisect.c @@ -991,7 +991,7 @@ int bisect_next_all(const char *prefix) if (!hashcmp(bisect_rev, current_bad_sha1)) { exit_if_skipped_commits(tried, current_bad_sha1); - printf("%s is first bad commit\n", bisect_rev_hex); + printf("%s is the first bad commit\n", bisect_rev_hex); show_diff_tree(prefix, revs.commits->item); /* This means the bisection process succeeded. */ exit(10); diff --git a/git-bisect.sh b/git-bisect.sh index 8969553..6f6f039 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -405,7 +405,7 @@ bisect_run () { exit $res fi - if grep "is first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then + if grep "is the first bad commit" "$GIT_DIR/BISECT_RUN" > /dev/null; then echo "bisect run success" exit 0; fi diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 1315bab..def397c 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -175,7 +175,7 @@ test_expect_success 'bisect skip: successfull result' ' git bisect start $HASH4 $HASH1 && git bisect skip && git bisect bad > my_bisect_log.txt && - grep "$HASH2 is first bad commit" my_bisect_log.txt && + grep "$HASH2 is the first bad commit" my_bisect_log.txt && git bisect reset ' @@ -261,7 +261,7 @@ test_expect_success \ git bisect good $HASH1 && git bisect bad $HASH4 && git bisect run ./test_script.sh > my_bisect_log.txt && - grep "$HASH3 is first bad commit" my_bisect_log.txt && + grep "$HASH3 is the first bad commit" my_bisect_log.txt && git bisect reset' # We want to automatically find the commit that @@ -274,7 +274,7 @@ test_expect_success \ chmod +x test_script.sh && git bisect start $HASH4 $HASH1 && git bisect run ./test_script.sh > my_bisect_log.txt && - grep "$HASH4 is first bad commit" my_bisect_log.txt && + grep "$HASH4 is the first bad commit" my_bisect_log.txt && git bisect reset' # $HASH1 is good, $HASH5 is bad, we skip $HASH3 @@ -287,14 +287,14 @@ test_expect_success 'bisect skip: add line and then a new test' ' git bisect start $HASH5 $HASH1 && git bisect skip && git bisect good > my_bisect_log.txt && - grep "$HASH5 is first bad commit" my_bisect_log.txt && + grep "$HASH5 is the first bad commit" my_bisect_log.txt && git bisect log > log_to_replay.txt && git bisect reset ' test_expect_success 'bisect skip and bisect replay' ' git bisect replay log_to_replay.txt > my_bisect_log.txt && - grep "$HASH5 is first bad commit" my_bisect_log.txt && + grep "$HASH5 is the first bad commit" my_bisect_log.txt && git bisect reset ' @@ -335,7 +335,7 @@ test_expect_success 'bisect run & skip: find first bad' ' chmod +x test_script.sh && git bisect start $HASH7 $HASH1 && git bisect run ./test_script.sh > my_bisect_log.txt && - grep "$HASH6 is first bad commit" my_bisect_log.txt + grep "$HASH6 is the first bad commit" my_bisect_log.txt ' test_expect_success 'bisect skip only one range' ' @@ -385,7 +385,7 @@ test_expect_success 'bisect does not create a "bisect" branch' ' rev_hash6=$(git rev-parse --verify HEAD) && test "$rev_hash6" = "$HASH6" && git bisect good > my_bisect_log.txt && - grep "$HASH7 is first bad commit" my_bisect_log.txt && + grep "$HASH7 is the first bad commit" my_bisect_log.txt && git bisect reset && rev_hash6=$(git rev-parse --verify bisect) && test "$rev_hash6" = "$HASH6" && @@ -534,7 +534,7 @@ test_expect_success 'restricting bisection on one dir' ' para1=$(git rev-parse --verify HEAD) && test "$para1" = "$PARA_HASH1" && git bisect bad > my_bisect_log.txt && - grep "$PARA_HASH1 is first bad commit" my_bisect_log.txt + grep "$PARA_HASH1 is the first bad commit" my_bisect_log.txt ' test_expect_success 'restricting bisection on one dir and a file' ' @@ -552,7 +552,7 @@ test_expect_success 'restricting bisection on one dir and a file' ' para1=$(git rev-parse --verify HEAD) && test "$para1" = "$PARA_HASH1" && git bisect good > my_bisect_log.txt && - grep "$PARA_HASH4 is first bad commit" my_bisect_log.txt + grep "$PARA_HASH4 is the first bad commit" my_bisect_log.txt ' test_expect_success 'skipping away from skipped commit' ' -- 1.6.4.1 -- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ ``` ## Junio C Hamano, 2009-08-26 09:05 Subject: Re: [PATCH] git-bisect: call the found commit "*the* first bad commit" Message-ID: <7vfxbfeyh5.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vfxbfeyh5.fsf%40alter.siamese.dyndns.org In-Reply-To: <20090826173850.6117@nanako3.lavabit.com> ``` Nanako Shiraishi writes: > .. as we learned in the school ;-) Thanks. Is it "learned in school", or do you also need "*the*" there? ;-) ``` ## Johannes Schindelin, 2009-08-26 10:08 Subject: Re: [PATCH] git-bisect: call the found commit "*the* first bad commit" Message-ID: URL: https://gitlist.dev/e/alpine.DEB.1.00.0908261207400.4713%40intel-tinevez-2-302 In-Reply-To: <7vfxbfeyh5.fsf@alter.siamese.dyndns.org> ``` Hi, On Wed, 26 Aug 2009, Junio C Hamano wrote: > Nanako Shiraishi writes: > > > .. as we learned in the school ;-) > > Thanks. > > Is it "learned in school", or do you also need "*the*" there? > > ;-) Well, I learnt at school that it is "learnt" and "at school"... double ;-) Ciao, Dscho ``` ## Alex Riesen, 2009-08-26 12:10 Subject: Re: [PATCH] git-bisect: call the found commit "*the* first bad commit" Message-ID: <81b0412b0908260510nd69738axe8cd4e8fb3b63d@mail.gmail.com> URL: https://gitlist.dev/e/81b0412b0908260510nd69738axe8cd4e8fb3b63d%40mail.gmail.com In-Reply-To: ``` On Wed, Aug 26, 2009 at 12:08, Johannes Schindelin wrote: > On Wed, 26 Aug 2009, Junio C Hamano wrote: >> Nanako Shiraishi writes: >> >> > .. as we learned in the school ;-) >> >> Thanks. >> >> Is it "learned in school", or do you also need "*the*" there? >> >> ;-) > > Well, I learnt at school that it is "learnt" and "at school"... > > double ;-) There is not one native speaker in this discussion, BTW :) http://www.thefreedictionary.com/learn http://www.thefreedictionary.com/school (look for American in "Translation") ``` ## Jeff King, 2009-08-26 15:29 Subject: Re: [PATCH] git-bisect: call the found commit "*the* first bad commit" Message-ID: <20090826152911.GA32741@coredump.intra.peff.net> URL: https://gitlist.dev/e/20090826152911.GA32741%40coredump.intra.peff.net In-Reply-To: ``` On Wed, Aug 26, 2009 at 12:08:11PM +0200, Johannes Schindelin wrote: > Well, I learnt at school that it is "learnt" and "at school"... > > double ;-) Bloody Europeans. ;) -Peff ``` ## Christian Couder, 2009-08-28 05:31 Subject: Re: [PATCH] git-bisect: call the found commit "*the* first bad commit" Message-ID: <200908280731.12827.chriscool@tuxfamily.org> URL: https://gitlist.dev/e/200908280731.12827.chriscool%40tuxfamily.org In-Reply-To: <20090826173850.6117@nanako3.lavabit.com> ``` On Wednesday 26 August 2009, Nanako Shiraishi wrote: > .. as we learned in the school ;-) > > Signed-off-by: Nanako Shiraishi > --- > bisect.c | 2 +- > git-bisect.sh | 2 +- > t/t6030-bisect-porcelain.sh | 18 +++++++++--------- > 3 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/bisect.c b/bisect.c > index 7f20acb..dc18db8 100644 > --- a/bisect.c > +++ b/bisect.c > @@ -991,7 +991,7 @@ int bisect_next_all(const char *prefix) > > if (!hashcmp(bisect_rev, current_bad_sha1)) { > exit_if_skipped_commits(tried, current_bad_sha1); > - printf("%s is first bad commit\n", bisect_rev_hex); > + printf("%s is the first bad commit\n", bisect_rev_hex); > show_diff_tree(prefix, revs.commits->item); > /* This means the bisection process succeeded. */ > exit(10); Thanks, but I wonder if this could give the false impression that there can only be one "first bad commit". Because it's possible that a bug appears in one commit say A, then get fixed in another one say B, and eventually reappears in a third one say C. So if the bisection range contains all these commits, the result from bisecting could be A or C. Best regards, Christian. ```