From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Torvalds Subject: Re: [git patches] libata updates, GPG signed (but see admin notes) Date: Fri, 4 Nov 2011 16:10:59 -0700 Message-ID: References: <20111026202235.GA20928@havoc.gtf.org> <1319969101.5215.20.camel@dabdike> <1320049150.8283.19.camel@dabdike> <7vy5w1ow90.fsf@alter.siamese.dyndns.org> <7vwrbjlj5r.fsf@alter.siamese.dyndns.org> <7vk47jld5s.fsf@alter.siamese.dyndns.org> <7vlirvbq47.fsf@alter.siamese.dyndns.org> <7v39e3bn1n.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Cc: git@vger.kernel.org, Shawn Pearce , James Bottomley , Jeff Garzik , Andrew Morton , linux-ide@vger.kernel.org, LKML To: Junio C Hamano X-From: linux-ide-owner@vger.kernel.org Sat Nov 05 00:11:25 2011 Return-path: Envelope-to: lnx-linux-ide@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RMSuy-0008KL-BL for lnx-linux-ide@lo.gmane.org; Sat, 05 Nov 2011 00:11:24 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750975Ab1KDXLW (ORCPT ); Fri, 4 Nov 2011 19:11:22 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:64004 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891Ab1KDXLV (ORCPT ); Fri, 4 Nov 2011 19:11:21 -0400 Received: by wwi36 with SMTP id 36so4207538wwi.1 for ; Fri, 04 Nov 2011 16:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:from:date :x-google-sender-auth:message-id:subject:to:cc:content-type; bh=zDLv9vGK66m5/wxpdYS/urB5ns7m0cnTa+EjGZ6ttnU=; b=FP8JtVs12mQxHGbhATaCwX2dDgPG/58mJeMidz68I9HGDiT5fKrJMjWFmgFZwVn21c AWoyjYrOq7Q6g6PhN4zC3zfsLF2A6RRlyjOCekMq7elN3hbkbuNQUFE7v5xQ0+QFSY8G vUT5M7thj00GIec3j9tNlAXWZfv4hRcOiDDjA= Received: by 10.216.133.217 with SMTP id q67mr3633860wei.97.1320448280272; Fri, 04 Nov 2011 16:11:20 -0700 (PDT) Received: by 10.216.166.3 with HTTP; Fri, 4 Nov 2011 16:10:59 -0700 (PDT) In-Reply-To: <7v39e3bn1n.fsf@alter.siamese.dyndns.org> X-Google-Sender-Auth: 4ALveBQpD7ONZ_LX_QgLc0Bu1to Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org Archived-At: On Fri, Nov 4, 2011 at 2:22 PM, Junio C Hamano wrote: > > builtin/merge.c was updated to use want_commit() that uses peel_to_type() > to commit to make sure we do not get fed anything funky, and also uses > struct commit_list to pass around list of parents to be recorded, so we > should be OK in this department. I'm pretty sure people have already done "git merge v3.1" kind of things using local tags (where no peeling of FETCH_HEAD has been done). See git log --merges --grep 'Merge.*v[23]\.[0-9]' for a ton of examples of this (and there's something odd going on: we have "Merge commit .." and "Merge tag ..", and I suspect the latter is people editing it to be correct by hand, but I dunno). So this has always worked, methinks. However - exactly beause git apparently makes it do that "Merge commit " message, I suspect we've peeled things too early and too much. We've peeled it so early that once again something thinks it's a commit, not a tag. So if anything, I suspect "git merge" not only peels, but peels too much (or at the wrong point). We should probably peel as late as possible. But it's a small detail. Linus