On Mon, May 11, 2015 at 02:12:51PM -0700, Junio C Hamano wrote:
> Trevor Saunders <tbsaunde@xxxxxxxxxxxx> writes:
> > This also fixes an odd inconsistancy where if the first bad commit is a
> > trivial merge git bisect will only print the first line.
> > ---
>
> Sign-off?
oops, forgot
> > - printf("%s is the first bad commit\n", bisect_rev_hex);
> > + puts("the first bad commit is");
>
> s/the/The/, I would think.
yup
> > diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
> > index 06b4868..bf50d20 100755
> > --- a/t/t6030-bisect-porcelain.sh
> > +++ b/t/t6030-bisect-porcelain.sh
> > @@ -26,6 +26,14 @@ add_line_into_file()
> > git commit --quiet -m "$MSG" $_file
> > }
> >
> > +check_bisect_msg()
> > +{
>
> Find this paragraph in Documentation/CodingGuidelines:
>
> - We prefer a space between the function name and the parentheses,
> and no space inside the parentheses. The opening "{" should also
> be on the same line.
yeah, I did it that way to be consistant with the near by
function add_lineinto_file, but I can change if that's prefered.
> > + 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.
--
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