* 'git merge tag' not working as before
@ 2012-05-30 18:06 Felipe Contreras
2012-05-30 22:18 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Felipe Contreras @ 2012-05-30 18:06 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: 'git merge tag' not working as before
2012-05-30 18:06 'git merge tag' not working as before Felipe Contreras
@ 2012-05-30 22:18 ` Junio C Hamano
2012-05-30 23:12 ` Felipe Contreras
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2012-05-30 22:18 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: 'git merge tag' not working as before
2012-05-30 22:18 ` Junio C Hamano
@ 2012-05-30 23:12 ` Felipe Contreras
0 siblings, 0 replies; 3+ messages in thread
From: Felipe Contreras @ 2012-05-30 23:12 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-05-30 23:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-30 18:06 'git merge tag' not working as before Felipe Contreras
2012-05-30 22:18 ` Junio C Hamano
2012-05-30 23:12 ` Felipe Contreras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).