This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: gold patch RFC: fix address size of DW_FORM_ref_addr
On Tue, Nov 21, 2017 at 6:59 AM, Joel Brobecker <brobecker@adacore.com> wrote:
>> I'd like to backport this patch to the 2.28 and 2.29 release branches,
>> but now that we are using git I find that I don't know how to do that.
>> I thought there would be a branch for the release, but according to
>> `git branch --list` there is not. There is only a tag. What is the
>> current binutils process for backporting a patch to the release
>> branch? Thanks.
>
> "git branch --list" only lists the branches that you created locally.
> The release branches should be visible from your clone, if you use
> "git branch -r" instead. Eg:
>
> $ git branch -r | grep 2_29
> origin/binutils-2_29-branch
>
> You'll need to create a local branch in your clone so you can
> cherry-pick the change from master. One way to do so is:
>
> $ git branch --track binutils-2_29-branch origin/binutils-2_29-branch
> $ git checkout binutils-2_29-branch
>
> If you have a recent-enough version of git, you might even be
> able to just...
>
> $ git checkout binutils-2_29-branch
>
> ... with git creating the branch automatically for you.
>
> You can then cherry-pick the patch you want to backport,
> grumble a bit about ChangeLogs while you resolve the merge
> conflict(s) there, and once the commit on the branch is
> ready, just push it:
>
> $ git push origin binutils-2_29-branch
Thanks.
Ian