From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [git patches] libata updates, GPG signed (but see admin notes) Date: Thu, 10 Nov 2011 09:18:11 -0800 Message-ID: <7v39dvuca4.fsf@alter.siamese.dyndns.org> 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> <7v62j1gitn.fsf@alter.siamese.dyndns.org> <7vvcr1f38j.fsf@alter.siamese.dyndns.org> <7v4nydurzh.fsf@alter.siamese.dyndns.org> <7vaa84t3ek.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Linus Torvalds , "Ted Ts'o" , Shawn Pearce , git@vger.kernel.org, James Bottomley , Jeff Garzik , Andrew Morton , linux-ide@vger.kernel.org, LKML To: Johan Herland X-From: git-owner@vger.kernel.org Thu Nov 10 18:18:30 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ROYGh-00061l-6O for gcvg-git-2@lo.gmane.org; Thu, 10 Nov 2011 18:18:27 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935945Ab1KJRSS (ORCPT ); Thu, 10 Nov 2011 12:18:18 -0500 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:64309 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935923Ab1KJRSP (ORCPT ); Thu, 10 Nov 2011 12:18:15 -0500 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id F414D441E; Thu, 10 Nov 2011 12:18:13 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=34Qa8G0ARPlb60w/vGeX+6VnZGk=; b=D0X2j0 nF+KVaDvkiUHdX5YrK+yvoVzI7Cqdl8L1cHdubH0NvHwLf1Goyw0vKAwTxRX+GSt OUJBodaHLum+CRoCdK6/sViZ6gn0fRYtEv1J26gtW+SF/rkRjbcc67pPjnLZDOqk mWLPj7Qku6K6iy+mH4a889IXpGELA/Yp6jYag= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=FoTuZn3QzKDEKLAdqROl2dWkiLNJb1W2 i+3OrGOYp2WOYwFYxx7VzQSvSCi/1yy6ffuAD1Y8OqV49Jq9jn4OMqzu1cle+BjQ pVUXOpviz5MozFQBGkpBNAs/E+0fwwrhkkctElRg/lTvXHqOFzVSkL+HGsW1Lfzj /qPiAeJqsYQ= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id EB144441C; Thu, 10 Nov 2011 12:18:13 -0500 (EST) Received: from pobox.com (unknown [76.102.170.102]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 725A4441B; Thu, 10 Nov 2011 12:18:13 -0500 (EST) In-Reply-To: (Johan Herland's message of "Thu, 10 Nov 2011 17:03:17 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: F897611A-0BBF-11E1-AEEE-9DB42E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Johan Herland writes: > What about having one notes ref per branch? If/when the branch is merged, > the associated notes ref containing the annotations for the commits on that > branch would be merged as well (using "git notes merge"). That is a crude workaround that you could (with help from users) make it work, but it does not change the fact that the current mechanism to transfer and integrate notes across repositories is a bad match for what the "signed commit" type annotations wants to achieve. In fact, the need for such a workaround is an illustration of how bad a match the mechanism is. When you merge a history that has commit A into another history that did not have that commit, the act of creating a merge commit itself should be enough to make the resulting history to contain that commit. The commit DAG already expresses it, and if a parallel "notes" mechanism needs to be futzed with to match that DAG, and command like "merge" needs to be told to help that process, that is a shortcoming of the "notes" mechanism.