[U-Boot] Pull request: u-boot-tegra/next

Albert ARIBAUD
2011-12-22T22:51:01Z

Le 22/12/2011 22:51, Tom Warren a ?crit :
> I did a 'git fetch git://git.denx.de/u-boot-arm.git', then rebased on that, as per the Workflow for Custodian git Repos wiki page. But that gave me a large number of changes in my pull request (most of which weren't my recent ones). So I did (on Simon's advice):

Note that the flow is for master branches, not next, although it can
apply on next as well if you request a pull of a next into a next.

> git checkout -b next-try u-boot-arm/master
> git cherry-pick next~23, etc. for the commits I'd added since the last pull request.

You should not have to cherry-pick. If your rebase does not fail, it
should leave your branch with only tour patches on it. However,
cherry-picking should work just as ok. Note BTW that you can cherry-pick
a range, IIRC.

> This resulted in a pull request w/just my commits, as below. So I make 'next-try' my 'next' branch& pushed it to u-boot-tegra.

Yet this does not tell me if you want it pushed on my next or master...

> Note that I see this in my 'u-boot-arm' cloned repo, master branch:
>
> commit 4f1a2cd1637027f31de7796aedb1fa5fc0ec0f97
> Merge: f8d2c65 953209b
> Author: Wolfgang Denk<wd@denx.de>
> Date: Mon Dec 12 07:56:41 2011 +0100

Is that what you see as 'u-boot-arm/master' ? Had you done a 'git fetch
u-boot-arm' (or whatever is your nickname for the ARM repo) before
rebasing? Because since dec 20, u-boot-arm/master is at commit
e570fe8ef2734fddc15e086b7bc344e64c907e81 -- and anyway, that is a commit
by Wolfgang to merge the ARM repo, not a commit *from* the ARM repo.

> Merge branch 'master' of git://git.denx.de/u-boot-arm
>
> * 'master' of git://git.denx.de/u-boot-arm:
> arm: add __aeabi_unwind_cpp_pr1() function to avoid linker complaints
> post: fix compile issue for post tests on kirkwood
>
> The second hash in the 'Merge: ...' line has the below commit #. Maybe things diverged at some point?

Things cannot diverge between u-boot and u-bot-arm, as I always rebase
my pull requests onto the latest u-boot master branch at the very time
of the request -- just like pull requests to ARM should always be done
above the current u-boot-arm/master.

> Let me know how I can straighten this out. I'd like to get it in before I leave for the holidays.

My advice is:

1) Before requesting a pull, make sure you are rebased against the
latest u-boo-arm master and next branches by doing a 'git fetch
u-boot-arm' (or whatever your remote nickname for the ARM repo is; if
you don't have a remote nickname for it, then do a 'git fetch
git://git.denx.de/u-boot-arm') then a 'git rebase u-boot-arm/master'
(assuming your own master branch is checked out of course).

I personally always use the commands

git checkout master [that's my local ARM master branch]
git fetch u-boot [that syncs my local copy of u-boot/master]
git rebase u-boot/master [after that I'm good for a pull req]

before a 'git request-pull'.

2) explicitly state which ARM branch the pull should be done into. If
you don't specify explicitly but the branch to pull from is master, I'll
pull into ARM master, but otherwise, I'll ask.

> Thanks,

np

> Tom

Amicalement,
--
Albert.