# 'git merge tag' not working as before

3 messages from 2012-05-30 to 2012-05-30. Participants: Felipe Contreras, Junio C Hamano.
Thread: https://gitlist.dev/t/30661

## Felipe Contreras, 2012-05-30 18:06

Subject: 'git merge tag' not working as before
Message-ID: <CAMP44s1bry3=W8hJPP9mJLzHmXFZug58aimGHhCSzwS9+Q-yWw@mail.gmail.com>
URL: https://gitlist.dev/e/CAMP44s1bry3%3DW8hJPP9mJLzHmXFZug58aimGHhCSzwS9%2BQ-yWw%40mail.gmail.com

```
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, 2012-05-30 22:18

Subject: Re: 'git merge tag' not working as before
Message-ID: <7vfwahxqhr.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vfwahxqhr.fsf%40alter.siamese.dyndns.org
In-Reply-To: <CAMP44s1bry3=W8hJPP9mJLzHmXFZug58aimGHhCSzwS9+Q-yWw@mail.gmail.com>

```
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.

```

## Felipe Contreras, 2012-05-30 23:12

Subject: Re: 'git merge tag' not working as before
Message-ID: <CAMP44s0EQOgEKQ7x1as7HAi0UHcWmJwnuWNYQ9ifpThOLYx5MQ@mail.gmail.com>
URL: https://gitlist.dev/e/CAMP44s0EQOgEKQ7x1as7HAi0UHcWmJwnuWNYQ9ifpThOLYx5MQ%40mail.gmail.com
In-Reply-To: <7vfwahxqhr.fsf@alter.siamese.dyndns.org>

```
On Thu, May 31, 2012 at 12:18 AM, Junio C Hamano <gitster@pobox.com> wrote:
> 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

```