Re: What's cooking in git.git (Feb 2010, #05; Sun, 21)

From: Jeff King <peff@peff.net>
Date: Feb 22, 2010, 10:37 UTC
Message-ID: <20100222103709.GA16531@coredump.intra.peff.net>
In-Reply-To: <alpine.DEB.1.00.1002221108100.20986@pacific.mpi-cbg.de>

On Mon, Feb 22, 2010 at 11:08:51AM +0100, Johannes Schindelin wrote:

Show 6 quoted lines

> > You mean this one?
> > 
> >   http://permalink.gmane.org/gmane.comp.version-control.git/108330
> 
> Yes, indeed. But it was applied, I just did not find it due to the name, 
> which is not intuitive to this developer.

It is also slightly overkill if all you want to do is pull Junio's topics from pu (I found myself always forgetting the right incantation of command line options). The script posted by Björn is much shorter, but recovers all topic branches. If you just want to pull one, I think:

  #!/bin/sh
  sha1=`git log --oneline --first-parent origin/pu |
        grep -m 1 "Merge branch '$1'" |
        cut -d ' ' -f1`
  git branch ${2:-$1} $sha1^2

should work. Though I have not been using it very long myself, so it is possible that it has bugs. :)

-Peff