From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann Droneaud Subject: Re: git merge behavior Date: Wed, 20 Mar 2013 19:12:52 +0100 Message-ID: <1363803172.6289.49.camel@test.quest-ce.net> References: <1363704914.6289.39.camel@test.quest-ce.net> <7vfvzrjrad.fsf@alter.siamese.dyndns.org> <1363802682.6289.46.camel@test.quest-ce.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Git To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Mar 20 19:13:37 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UINW4-0000Fv-E2 for gcvg-git-2@plane.gmane.org; Wed, 20 Mar 2013 19:13:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757297Ab3CTSND convert rfc822-to-quoted-printable (ORCPT ); Wed, 20 Mar 2013 14:13:03 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:41723 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752503Ab3CTSNC (ORCPT ); Wed, 20 Mar 2013 14:13:02 -0400 Received: from [192.168.20.20] (unknown [37.161.174.182]) by smtp1-g21.free.fr (Postfix) with ESMTP id AEE0B9401E1; Wed, 20 Mar 2013 19:12:54 +0100 (CET) In-Reply-To: <1363802682.6289.46.camel@test.quest-ce.net> X-Mailer: Evolution 3.4.4 (3.4.4-2.fc17) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Hi, =20 Le mercredi 20 mars 2013 =C3=A0 19:04 +0100, Yann Droneaud a =C3=A9crit= : > > > 2) git merge VS git merge > > > > > > If is an object (not a lightweight/reference tag), git merg= e > > > ... > > > But, if you use the tag object-id instead of its name, for exampl= e using > > > git merge `git parse-rev `, > [EDIT] > > > signature is not checked. Git still create a merge commit, but do= esn't > > > prepare a commit message with the tag message and the signature: > > > > > > It would be great to have Git using the tag message and check the > > > signature. > >=20 > > Perhaps, but if you feed the $(git rev-parse v1.12.2) to merge, you= r > > subject will not be able to say "Merge tag 'v1.12.2'" in the first > > place, so I do not think you would want to encourage such usage in > > the first place. >=20 > I think if someone want to merge the tag object-id instead of the tag= , > the commit subject/message should probably not make a reference to th= e > tag. >=20 > The only use case for such tag merging by commit-id would be to get > consistent behavior in case of tag deletion. The named tag could be > recreated to point to another point in time. So when looking at the > merge commit message and searching for the tag (by name) could be > misleading. >=20 But but do not take those remarks as a feature request. I was just asking for clarification/comment on the behavior difference between merging tag/tag object-id. Regards --=20 Yann Droneaud OPTEYA