[petsc-dev] Failure of mergecov

Satish Balay balay at mcs.anl.gov
Thu Oct 8 21:03:58 CDT 2020


MR at: https://gitlab.com/petsc/petsc/-/merge_requests/3327

Satish

On Thu, 8 Oct 2020, Barry Smith wrote:

> 
>   Yes, I think Satish's fix is correct.
> 
>   Barry
> 
> 
> > On Oct 8, 2020, at 4:54 PM, Satish Balay <balay at mcs.anl.gov> wrote:
> > 
> >> fatal: ambiguous argument 'origin/master...': unknown revision or path not in the working tree.
> > 
> > Likely a bug in this check [which I think is expected to create origin/master in the clone] ..
> > 
> > Satish
> > 
> > diff --git a/lib/petsc/bin/maint/check-merge-branch.sh b/lib/petsc/bin/maint/check-merge-branch.sh
> > index f590b9c646..3ba477c4af 100755
> > --- a/lib/petsc/bin/maint/check-merge-branch.sh
> > +++ b/lib/petsc/bin/maint/check-merge-branch.sh
> > @@ -1,6 +1,7 @@
> > #!/bin/bash -e
> > 
> > if [ ! -z ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME+x} ]; then
> > +  git fetch -q --unshallow --no-tags +${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:remotes/origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
> >   echo origin/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
> >   exit 0
> > fi
> > 
> > On Thu, 8 Oct 2020, Barry Smith wrote:
> > 
> >> 
> >> git diff --name-only origin/master...' returned non-zero exit status 128.
> >> 
> >> 
> >>  I did a retry, let's see if that works.
> >> 
> >>  I can protect this with a try so it won't crash CI and waste people's time. 
> >> 
> >>  I'll look at the log more closely later and see if I guess the cause.
> >> 
> >>  Barry
> >> 
> >> 
> >>> On Oct 8, 2020, at 3:03 PM, Matthew Knepley <knepley at gmail.com> wrote:
> >>> 
> >>> Barry, I got this
> >>> 
> >>>  https://gitlab.com/petsc/petsc/-/jobs/780244679 <https://gitlab.com/petsc/petsc/-/jobs/780244679>
> >>> 
> >>> in this pipeline analysis
> >>> 
> >>>  https://gitlab.com/petsc/petsc/-/pipelines/199842334 <https://gitlab.com/petsc/petsc/-/pipelines/199842334>
> >>> 
> >>> I did not use the CI issue because this is about code.
> >>> 
> >>>  Thanks,
> >>> 
> >>>     Matt
> >>> 
> >>> -- 
> >>> What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.
> >>> -- Norbert Wiener
> >>> 
> >>> https://www.cse.buffalo.edu/~knepley/ <http://www.cse.buffalo.edu/~knepley/>
> >> 
> >> 
> > 
> 



More information about the petsc-dev mailing list