General and development mailing list for Git, a distributed version control system

Jonathan Nieder | 20 Aug 2012 22:40

How to request a fast-forward pull

Hi gitsters,

Paul Gortmaker wrote:

> When you have a moment, would you please migrate this
> across to your main linux-stable repository?
>
> Both a branch and signed tag are present and pointing at
> the same commit, but "git request-pull" does favour output
> of the tag over the branch name.
>
> But merging the tag will want to create a merge commit.
>
> So, to avoid a merge commit in your repo, you can fetch
> (fast fwd) into your (local) branch from my branch at:
>
>  git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable.git linux-2.6.34.y
>
> and then fetch the signed tag listed below after that.

Can this be made easier?  I could imagine request-pull learning
--ff-only that generates a message like

	Greg,

	Please pull --ff-only

	 git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable.git linux-2.6.34.y

	to get the following changes [...]

(Continue reading)

headers

Jeff King | 21 Aug 2012 08:41

Re: How to request a fast-forward pull

On Mon, Aug 20, 2012 at 01:40:33PM -0700, Jonathan Nieder wrote:

> > When you have a moment, would you please migrate this
> > across to your main linux-stable repository?
> >
> > Both a branch and signed tag are present and pointing at
> > the same commit, but "git request-pull" does favour output
> > of the tag over the branch name.
> >
> > But merging the tag will want to create a merge commit.
> >
> > So, to avoid a merge commit in your repo, you can fetch
> > (fast fwd) into your (local) branch from my branch at:
> >
> >  git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable.git linux-2.6.34.y
> >
> > and then fetch the signed tag listed below after that.
> 
> Can this be made easier?  I could imagine request-pull learning
> --ff-only that generates a message like
> 
> 	Greg,
> 
> 	Please pull --ff-only
> 
> 	 git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable.git linux-2.6.34.y
> 
> 	to get the following changes [...]
> 
> which could work ok if the recipient notices the --ff-only, but I

(Continue reading)

headers

Junio C Hamano | 21 Aug 2012 19:22

Re: How to request a fast-forward pull

Jeff King <peff <at> peff.net> writes:

> On Mon, Aug 20, 2012 at 01:40:33PM -0700, Jonathan Nieder wrote:
>
>> > When you have a moment, would you please migrate this
>> > across to your main linux-stable repository?
>> >
>> > Both a branch and signed tag are present and pointing at
>> > the same commit, but "git request-pull" does favour output
>> > of the tag over the branch name.
>> >
>> > But merging the tag will want to create a merge commit.
>> >
>> > So, to avoid a merge commit in your repo, you can fetch
>> > (fast fwd) into your (local) branch from my branch at:
>> >
>> >  git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable.git linux-2.6.34.y
>> >
>> > and then fetch the signed tag listed below after that.
>> 
>> Can this be made easier?  I could imagine request-pull learning
>> --ff-only that generates a message like
>> 
>> 	Greg,
>> 
>> 	Please pull --ff-only

Where did the "Greg,\n\n" come from?  Isn't it just the matter of
adding the "--ff-only" when that string is added?

(Continue reading)

headers

Ben Hutchings | 23 Aug 2012 02:31

Re: How to request a fast-forward pull

On Tue, 2012-08-21 at 10:22 -0700, Junio C Hamano wrote:
> Jeff King <peff <at> peff.net> writes:
> 
> > On Mon, Aug 20, 2012 at 01:40:33PM -0700, Jonathan Nieder wrote:
> >
> >> > When you have a moment, would you please migrate this
> >> > across to your main linux-stable repository?
> >> >
> >> > Both a branch and signed tag are present and pointing at
> >> > the same commit, but "git request-pull" does favour output
> >> > of the tag over the branch name.
> >> >
> >> > But merging the tag will want to create a merge commit.
> >> >
> >> > So, to avoid a merge commit in your repo, you can fetch
> >> > (fast fwd) into your (local) branch from my branch at:
> >> >
> >> >  git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable.git linux-2.6.34.y
> >> >
> >> > and then fetch the signed tag listed below after that.
> >> 
> >> Can this be made easier?  I could imagine request-pull learning
> >> --ff-only that generates a message like
> >> 
> >> 	Greg,
> >> 
> >> 	Please pull --ff-only
> 
> Where did the "Greg,\n\n" come from?  Isn't it just the matter of
> adding the "--ff-only" when that string is added?

(Continue reading)