{"thread":{"id":"30661","subject":"'git merge tag' not working as before","startedAt":"2012-05-30T18:06:15Z","lastAt":"2012-05-30T23:12:17Z","messageCount":3,"participants":["Felipe Contreras","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"192503","messageId":"CAMP44s1bry3=W8hJPP9mJLzHmXFZug58aimGHhCSzwS9+Q-yWw@mail.gmail.com","threadId":"30661","inReplyTo":null,"subject":"'git merge tag' not working as before","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-05-30T18:06:15Z","receivedAt":"2012-05-30T18:06:15Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Hi,\n\nI used to do things like 'git merge v1.7.10.3' (from v1.7.10.2) but\neven though it's ff it tries to create a merge commit.\n\nSeems like now I have to run 'git merge v1.7.10.3^0', I don't see why\nthat would be desirable.\n\nI think this is a bug and a regression.\n\nCheers.\n\n-- \nFelipe Contreras\n"},{"id":"192522","messageId":"7vfwahxqhr.fsf@alter.siamese.dyndns.org","threadId":"30661","inReplyTo":"CAMP44s1bry3=W8hJPP9mJLzHmXFZug58aimGHhCSzwS9+Q-yWw@mail.gmail.com","subject":"Re: 'git merge tag' not working as before","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-05-30T22:18:08Z","receivedAt":"2012-05-30T22:18:08Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras <felipe.contreras@gmail.com> writes:\n\n> I used to do things like 'git merge v1.7.10.3' (from v1.7.10.2) but\n> even though it's ff it tries to create a merge commit.\n>\n> Seems like now I have to run 'git merge v1.7.10.3^0', I don't see why\n> that would be desirable.\n>\n> I think this is a bug and a regression.\n\nIt was a deliberate feature enhancement a few releases back, IIRC.\n\nYou should be able to say \"git merge --ff-only v1.7.10.3\" as well.\n"},{"id":"192523","messageId":"CAMP44s0EQOgEKQ7x1as7HAi0UHcWmJwnuWNYQ9ifpThOLYx5MQ@mail.gmail.com","threadId":"30661","inReplyTo":"7vfwahxqhr.fsf@alter.siamese.dyndns.org","subject":"Re: 'git merge tag' not working as before","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2012-05-30T23:12:17Z","receivedAt":"2012-05-30T23:12:17Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Thu, May 31, 2012 at 12:18 AM, Junio C Hamano <gitster@pobox.com> wrote:\n> Felipe Contreras <felipe.contreras@gmail.com> writes:\n>\n>> I used to do things like 'git merge v1.7.10.3' (from v1.7.10.2) but\n>> even though it's ff it tries to create a merge commit.\n>>\n>> Seems like now I have to run 'git merge v1.7.10.3^0', I don't see why\n>> that would be desirable.\n>>\n>> I think this is a bug and a regression.\n>\n> It was a deliberate feature enhancement a few releases back, IIRC.\n>\n> You should be able to say \"git merge --ff-only v1.7.10.3\" as well.\n\nHow is that an enhancement?\n\nBasically:\n\n  git merge branch # fast-forward\n  git merge tag # fast-forward\n  git merge annotated-tag # not fast-forward\n\nWhy should I do different actions depending on whether the tag is\nannotated or not? 99% of users probably have never used annotated\ntags, why complicate the interface for 99% of users, when the 1% of\nusers who actually want the messages of the annotated tag in their\nmerge message can just do --no-ff?\n\nCheers.\n\n-- \nFelipe Contreras\n"}]}