threads / discuss / 30661

'git merge tag' not working as before

Subject: 'git merge tag' not working as before

## tl;dr

3 messages between May 30, 2012 and May 30, 2012.

replies: 2people: 2as markdown or json

Felipe Contreras· May 30, 2012, 18:06 UTC · lore

Hi,

I used to do things like 'git merge v1.7.10.3' (from v1.7.10.2) but even though it's ff it tries to create a merge commit.

Seems like now I have to run 'git merge v1.7.10.3^0', I don't see why that would be desirable.

I think this is a bug and a regression.

Cheers.

-- 
Felipe Contreras

Junio C Hamano· May 30, 2012, 22:18 UTC · re: Felipe Contreras · lore

Re: 'git merge tag' not working as before

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 7 quoted lines

> I used to do things like 'git merge v1.7.10.3' (from v1.7.10.2) but
> even though it's ff it tries to create a merge commit.
>
> Seems like now I have to run 'git merge v1.7.10.3^0', I don't see why
> that would be desirable.
>
> I think this is a bug and a regression.

It was a deliberate feature enhancement a few releases back, IIRC.

You should be able to say "git merge --ff-only v1.7.10.3" as well.

Felipe Contreras· May 30, 2012, 23:12 UTC · re: Junio C Hamano · lore

Re: 'git merge tag' not working as before

On Thu, May 31, 2012 at 12:18 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> I used to do things like 'git merge v1.7.10.3' (from v1.7.10.2) but
>> even though it's ff it tries to create a merge commit.
>>
>> Seems like now I have to run 'git merge v1.7.10.3^0', I don't see why
>> that would be desirable.
>>
>> I think this is a bug and a regression.
>
> It was a deliberate feature enhancement a few releases back, IIRC.
>
> You should be able to say "git merge --ff-only v1.7.10.3" as well.

How is that an enhancement?

Basically:

  git merge branch # fast-forward
  git merge tag # fast-forward
  git merge annotated-tag # not fast-forward

Why should I do different actions depending on whether the tag is annotated or not? 99% of users probably have never used annotated tags, why complicate the interface for 99% of users, when the 1% of users who actually want the messages of the annotated tag in their merge message can just do --no-ff?

Cheers.

-- 
Felipe Contreras