You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@samoa.apache.org by Gianmarco De Francisci Morales <gd...@apache.org> on 2015/02/02 12:42:27 UTC
Re: [DISCUSS] Dev git setup
OK,
I was trying to check out a pull request today and I realized there is
something missing from this setup.
Namely, we need a remote for the Apache GitHub mirror because pull requests
are submitted there.
So my revised setup is now:
→ git remote -v
apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git (fetch)
apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git (push)
origin git@github.com:gdfm/incubator-samoa.git (fetch)
origin git@github.com:gdfm/incubator-samoa.git (push)
upstream git@github.com:apache/incubator-samoa.git (fetch)
upstream git@github.com:apache/incubator-samoa.git (push)
And if I want to checkout a pull request I can simply do:
git fetch upstream pull/<pr_id>/head:<branch_name>
E.g., git fetch upstream pull/2/head:SAMOA-6 creates a branch SAMOA-6 with
the pull request checked out.
Cheers,
--
Gianmarco
On 28 January 2015 at 10:22, Gianmarco De Francisci Morales <gdfm@apache.org
> wrote:
> Hi,
>
> Just for me to be clear: GM, we’re talking rebasing locally but merge
>> committing in the repo right? Like we have been doing before? At least,
>> that’s how I read this right now. correct me if I’m wrong?
>>
>
>
> Yes, that's what I meant.
> Rebase the master locally (never commit to the local master), fork, merge
> commit back in the repo (possibly squashing all the commits on the branch
> in a single one that represents the patch).
>
> Cheers,
> --
> Gianmarco
>
Re: [DISCUSS] Dev git setup
Posted by Ted Dunning <te...@gmail.com>.
OK.
I just saw this one line in your output:
> > upstream git@github.com:apache/incubator-samoa.git (push)
I wasn't sure what you were doing, but wanted to give as many answers as
possible.
On Mon, Feb 2, 2015 at 8:56 AM, Gianmarco De Francisci Morales <
gdfm@apache.org> wrote:
> Yes, I know I can't push to the github mirror.
> I wanted to fetch from it. Specifically, fetch a PR to check it out
> locally.
> I hadn't configured a remote for the mirror (I only had one for my fork),
> so I couldn't do that.
> I just added one (upstream) and it solved the issue. I could then fetch the
> PR from the github mirror.
>
> It's not a question, just a suggestion for others if they come across the
> same problem.
>
> Cheers,
>
> --
> Gianmarco
>
> On 2 February 2015 at 17:19, Ted Dunning <te...@gmail.com> wrote:
>
> > You can't push to the github mirror.
> >
> > Other than that, I don't think I understand the question. Can you lay
> out
> > what you tried to do and what you expected in a bit more detail?
> >
> >
> >
> > On Mon, Feb 2, 2015 at 3:42 AM, Gianmarco De Francisci Morales <
> > gdfm@apache.org> wrote:
> >
> > > OK,
> > >
> > > I was trying to check out a pull request today and I realized there is
> > > something missing from this setup.
> > > Namely, we need a remote for the Apache GitHub mirror because pull
> > requests
> > > are submitted there.
> > > So my revised setup is now:
> > >
> > > → git remote -v
> > > apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git
> > (fetch)
> > > apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git
> > (push)
> > > origin git@github.com:gdfm/incubator-samoa.git (fetch)
> > > origin git@github.com:gdfm/incubator-samoa.git (push)
> > > upstream git@github.com:apache/incubator-samoa.git (fetch)
> > > upstream git@github.com:apache/incubator-samoa.git (push)
> > >
> > >
> > > And if I want to checkout a pull request I can simply do:
> > > git fetch upstream pull/<pr_id>/head:<branch_name>
> > >
> > > E.g., git fetch upstream pull/2/head:SAMOA-6 creates a branch SAMOA-6
> > with
> > > the pull request checked out.
> > >
> > >
> > > Cheers,
> > >
> > > --
> > > Gianmarco
> > >
> > > On 28 January 2015 at 10:22, Gianmarco De Francisci Morales <
> > > gdfm@apache.org
> > > > wrote:
> > >
> > > > Hi,
> > > >
> > > > Just for me to be clear: GM, we’re talking rebasing locally but merge
> > > >> committing in the repo right? Like we have been doing before? At
> > least,
> > > >> that’s how I read this right now. correct me if I’m wrong?
> > > >>
> > > >
> > > >
> > > > Yes, that's what I meant.
> > > > Rebase the master locally (never commit to the local master), fork,
> > merge
> > > > commit back in the repo (possibly squashing all the commits on the
> > branch
> > > > in a single one that represents the patch).
> > > >
> > > > Cheers,
> > > > --
> > > > Gianmarco
> > > >
> > >
> >
>
Re: [DISCUSS] Dev git setup
Posted by Gianmarco De Francisci Morales <gd...@apache.org>.
Yes, I know I can't push to the github mirror.
I wanted to fetch from it. Specifically, fetch a PR to check it out locally.
I hadn't configured a remote for the mirror (I only had one for my fork),
so I couldn't do that.
I just added one (upstream) and it solved the issue. I could then fetch the
PR from the github mirror.
It's not a question, just a suggestion for others if they come across the
same problem.
Cheers,
--
Gianmarco
On 2 February 2015 at 17:19, Ted Dunning <te...@gmail.com> wrote:
> You can't push to the github mirror.
>
> Other than that, I don't think I understand the question. Can you lay out
> what you tried to do and what you expected in a bit more detail?
>
>
>
> On Mon, Feb 2, 2015 at 3:42 AM, Gianmarco De Francisci Morales <
> gdfm@apache.org> wrote:
>
> > OK,
> >
> > I was trying to check out a pull request today and I realized there is
> > something missing from this setup.
> > Namely, we need a remote for the Apache GitHub mirror because pull
> requests
> > are submitted there.
> > So my revised setup is now:
> >
> > → git remote -v
> > apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git
> (fetch)
> > apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git
> (push)
> > origin git@github.com:gdfm/incubator-samoa.git (fetch)
> > origin git@github.com:gdfm/incubator-samoa.git (push)
> > upstream git@github.com:apache/incubator-samoa.git (fetch)
> > upstream git@github.com:apache/incubator-samoa.git (push)
> >
> >
> > And if I want to checkout a pull request I can simply do:
> > git fetch upstream pull/<pr_id>/head:<branch_name>
> >
> > E.g., git fetch upstream pull/2/head:SAMOA-6 creates a branch SAMOA-6
> with
> > the pull request checked out.
> >
> >
> > Cheers,
> >
> > --
> > Gianmarco
> >
> > On 28 January 2015 at 10:22, Gianmarco De Francisci Morales <
> > gdfm@apache.org
> > > wrote:
> >
> > > Hi,
> > >
> > > Just for me to be clear: GM, we’re talking rebasing locally but merge
> > >> committing in the repo right? Like we have been doing before? At
> least,
> > >> that’s how I read this right now. correct me if I’m wrong?
> > >>
> > >
> > >
> > > Yes, that's what I meant.
> > > Rebase the master locally (never commit to the local master), fork,
> merge
> > > commit back in the repo (possibly squashing all the commits on the
> branch
> > > in a single one that represents the patch).
> > >
> > > Cheers,
> > > --
> > > Gianmarco
> > >
> >
>
Re: [DISCUSS] Dev git setup
Posted by Ted Dunning <te...@gmail.com>.
You can't push to the github mirror.
Other than that, I don't think I understand the question. Can you lay out
what you tried to do and what you expected in a bit more detail?
On Mon, Feb 2, 2015 at 3:42 AM, Gianmarco De Francisci Morales <
gdfm@apache.org> wrote:
> OK,
>
> I was trying to check out a pull request today and I realized there is
> something missing from this setup.
> Namely, we need a remote for the Apache GitHub mirror because pull requests
> are submitted there.
> So my revised setup is now:
>
> → git remote -v
> apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git (fetch)
> apache https://git-wip-us.apache.org/repos/asf/incubator-samoa.git (push)
> origin git@github.com:gdfm/incubator-samoa.git (fetch)
> origin git@github.com:gdfm/incubator-samoa.git (push)
> upstream git@github.com:apache/incubator-samoa.git (fetch)
> upstream git@github.com:apache/incubator-samoa.git (push)
>
>
> And if I want to checkout a pull request I can simply do:
> git fetch upstream pull/<pr_id>/head:<branch_name>
>
> E.g., git fetch upstream pull/2/head:SAMOA-6 creates a branch SAMOA-6 with
> the pull request checked out.
>
>
> Cheers,
>
> --
> Gianmarco
>
> On 28 January 2015 at 10:22, Gianmarco De Francisci Morales <
> gdfm@apache.org
> > wrote:
>
> > Hi,
> >
> > Just for me to be clear: GM, we’re talking rebasing locally but merge
> >> committing in the repo right? Like we have been doing before? At least,
> >> that’s how I read this right now. correct me if I’m wrong?
> >>
> >
> >
> > Yes, that's what I meant.
> > Rebase the master locally (never commit to the local master), fork, merge
> > commit back in the repo (possibly squashing all the commits on the branch
> > in a single one that represents the patch).
> >
> > Cheers,
> > --
> > Gianmarco
> >
>