[petsc-dev] so Bitbucket and git suck once again
Satish Balay
balay at mcs.anl.gov
Fri Sep 12 08:05:51 CDT 2014
Yeah - we should use http - not ssh to access repos for pull requests.
At some point we should document this pull request process in the
git/wiki at bitbucket.
Satish
On Thu, 11 Sep 2014, Barry Smith wrote:
>
> On Sep 11, 2014, at 8:37 PM, Barry Smith <bsmith at mcs.anl.gov> wrote:
>
> Patrick,
>
> Never mind. I just need to change the git@ to access the repository. I’ll start on it tomorrow when my brain is fresh.
>
> Barry
>
>
> >
> > Patrick,
> >
> > Could you please give us read access to your repository so we can fetch it?
> >
> > Thanks
> >
> > Barry
> >
> > git fetch git at bitbucket.org:psanan/petsc psanan/ksp-fcg:psanan/ksp-fcg
> > conq: repository does not exist.
> > fatal: Could not read from remote repository.
> >
> > Please make sure you have the correct access rights
> > and the repository exists.
> >
> >
> >
> > On Sep 11, 2014, at 7:05 PM, Jed Brown <jed at jedbrown.org> wrote:
> >
> >> Barry Smith <bsmith at mcs.anl.gov> writes:
> >>
> >>> Jed
> >>>
> >>> So, I am in my PETSc repository and want to try out Patrick Sanan’s FCG since it is cool and we ignored it too long and need to get it into the repository. He’s made a nice pull request; great. So I do
> >>>
> >>> ~/Src/petsc master $ git checkout psanan/ksp-fcg
> >>> error: pathspec 'psanan/ksp-fcg' did not match any file(s) known to git.
> >>
> >> The branch is in his repository, not ours. Bitbucket has a major
> >> pull-request permissions problem in that he can make a PR to our
> >> repository without giving us read access to his repository. This sounds
> >> crazy and it is. Supposedly we would be able to merge using the web
> >> interface (if not for merge conflicts), but we can't even read the
> >> commits on the web:
> >>
> >> https://bitbucket.org/petsc/petsc/pull-request/197/kspfcg/commits
> >>
> >>
> >> If we had read access to his repository, I would run:
> >>
> >> git fetch git at bitbucket.org:psanan/petsc psanan/ksp-fcg:psanan/ksp-fcg
> >>
> >> to create a local branch in my repository named psanan/ksp-fcg. I would
> >> then
> >>
> >> git checkout psanan/ksp-fcg
> >> ... browse, run tests, etc
> >> git push -u origin psanan/ksp-fcg
> >>
> >> and merge if it looks good.
> >>
> >>> Then I fucking give up.
> >>>
> >>> Why doesn’t bitbucket produce useful information to get his branch without being a git guru? It should show the exact magical git incantation to pull his branch.
> >>>
> >>> 1) How do I pull his branch into my repository
> >>> 2) How do I know in the future when I want to do this again, how to pull his branch in when my long term memory is shot?
> >>
> >> Bitbucket is seriously dropping the ball on this interface. GitHub
> >> email notifications include the command to pull (merging into the
> >> current branch, so not quite what we want) and have solved the
> >> permissions problem. They also makes the PR branches available under
> >> refs/pull/*, so that you can get them without using the URL for the
> >> contributor's repo.
> >>
> >>
> >>
> >> Patrick, you have write access to the PETSc repository. Can you just
> >> push your branches there instead of your personal repo when creating a
> >> PR?
> >
>
>
More information about the petsc-dev
mailing list