generate a diff against a specific tag in a remote branch

Pedro Ribeiro· Mar 11, 2010, 09:44 UTC · lore

Hi all,

I currently have a copy of the kernel TuxOnIce git tree, and the latest tag is 2.6.33.

I also have added linus tree as a remote branch (git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git).

What I want to do is to make a patch of the TuxOnIce changes to apply to the linus' 2.6.33. The problem is that the linus tree keeps advacing, obviously, and is now at 2.6.34-rc1.

So what I've been trying to do is to make a diff against the 2.6.33 tag of linus' tree. Is this possible?

Thank you very much, Pedro

PS: Please CC me directly, I'm not on the list.

Alex Riesen· Mar 11, 2010, 10:44 UTC · re: Pedro Ribeiro · lore

Re: generate a diff against a specific tag in a remote branch

On Thu, Mar 11, 2010 at 10:44, Pedro Ribeiro <pedrib@gmail.com> wrote:

Show 12 quoted lines

> I currently have a copy of the kernel TuxOnIce git tree, and the
> latest tag is 2.6.33.
>
> I also have added linus tree as a remote branch
> (git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git).
>
> What I want to do is to make a patch of the TuxOnIce changes to apply
> to the linus' 2.6.33. The problem is that the linus tree keeps
> advacing, obviously, and is now at 2.6.34-rc1.
>
> So what I've been trying to do is to make a diff against the 2.6.33
> tag of linus' tree. Is this possible?

Probably. Try rebasing your TuxOnIce branch on the tag:

  $ git checkout -b temporary TuxOnIce
  $ git rebase v2.6.33

If it works out (you may have to correct some conflicts) during rebase, the branch "temporary" can be used to generate a set of patches to add TuxOnIce to a vanill 2.6.33 (by using git format-patch, for example).