On Mon, May 11, 2015 at 07:08:46PM -0700, Junio C Hamano wrote: > Trevor Saunders <tbsaunde@xxxxxxxxxxxx> writes: > > >> > + file=$1 > >> > + hash=$2 > >> > + grep "the first bad commit is" $file || return $? > >> > + grep $hash $file || return $? > >> > >> Is it OK to have these strings anywhere in the $file? > > > > Its not great, but the test seems to log multiple invokations of git > > bisect into the same file, so there may be text about previous runs > > before we are told which commit is bad. > > So if we had a previous entry that happens to match $hash, even if > the current test stopped and pointed at a different thing, this test > declares a success? err yeah, didn't think of that :( > This function knows how the $file should end, so it might be more > sensible to craft the expected output and compare the tail end of > the $file with it, something like: > > ( > echo "The first bad commit is" > git show -s "$hash" > ) >expect && > cnt=$(wc -l <expect) && > tail -n $cnt "$file" >actual && > test_cmp expect actual > > perhaps? seems about right. Thanks! Trev -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html