From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nick Hengeveld Subject: Re: git-http-push and hooks Date: Tue, 7 Feb 2006 15:48:12 -0800 Message-ID: <20060207234812.GC3833@reactrix.com> References: <20060206205203.GA20973@guybrush.melee> <20060206232231.GK3873@reactrix.com> <20060207195458.GA7217@c165.ib.student.liu.se> <20060207202351.GA3833@reactrix.com> <7vwtg6uaw6.fsf@assigned-by-dhcp.cox.net> <20060207224551.GB3833@reactrix.com> <7vpslysqcb.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Feb 08 00:49:01 2006 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1F6cZv-0006or-Dy for gcvg-git@gmane.org; Wed, 08 Feb 2006 00:48:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030292AbWBGXs5 (ORCPT ); Tue, 7 Feb 2006 18:48:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030290AbWBGXs4 (ORCPT ); Tue, 7 Feb 2006 18:48:56 -0500 Received: from 195.37.26.69.virtela.com ([69.26.37.195]:45856 "EHLO teapot.corp.reactrix.com") by vger.kernel.org with ESMTP id S1030292AbWBGXs4 (ORCPT ); Tue, 7 Feb 2006 18:48:56 -0500 Received: from teapot.corp.reactrix.com (localhost.localdomain [127.0.0.1]) by teapot.corp.reactrix.com (8.12.11/8.12.11) with ESMTP id k17NmCEi027479; Tue, 7 Feb 2006 15:48:13 -0800 Received: (from nickh@localhost) by teapot.corp.reactrix.com (8.12.11/8.12.11/Submit) id k17NmCq6027477; Tue, 7 Feb 2006 15:48:12 -0800 To: Junio C Hamano Content-Disposition: inline In-Reply-To: <7vpslysqcb.fsf@assigned-by-dhcp.cox.net> User-Agent: Mutt/1.4.1i Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Feb 07, 2006 at 03:26:28PM -0800, Junio C Hamano wrote: > If I and you clone from a shared repository at the same time, I > did my development while you did your own on top of that same > commit without pulling from the repository further, and I > uploaded my changes to update the ref, what should happen to you > once you are ready to push? > > Is that what being asked? > > If so, I think the sensible thing to do is to reject your push > and suggest you to pull first, just like the git native protocol > push does. That pull would end up first merging my changes to > your work in your repository, and then you can push the result > back to the shared repository. Otherwise you would lose my > changes. Makes sense, and it's the way http-push already works for heads. I guess where I'm not clear is tags - since info/refs is generated by recursing through everything in the refs/ subdirectory. I think I just answered my own question though; http-push needs to recurse through everything under refs/ on the remote end to generate the new info/refs file. That just leaves the problem that http-push doesn't push tags yet. -- For a successful technology, reality must take precedence over public relations, for nature cannot be fooled.