From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Watt Subject: Re: Working copy revision and push pain Date: Sun, 23 Mar 2008 15:35:54 +0100 Message-ID: <47E66ACA.5050806@jwatt.org> References: <47E64F71.3020204@jwatt.org> <47E658D3.1060104@jwatt.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org To: Johannes Schindelin X-From: git-owner@vger.kernel.org Sun Mar 23 15:36:41 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JdRJQ-0005L4-GG for gcvg-git-2@gmane.org; Sun, 23 Mar 2008 15:36:40 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758884AbYCWOf7 (ORCPT ); Sun, 23 Mar 2008 10:35:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758840AbYCWOf7 (ORCPT ); Sun, 23 Mar 2008 10:35:59 -0400 Received: from sd-green-bigip-207.dreamhost.com ([208.97.132.207]:37729 "EHLO spunkymail-a18.g.dreamhost.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757412AbYCWOf7 (ORCPT ); Sun, 23 Mar 2008 10:35:59 -0400 Received: from [192.168.1.6] (ip1-182-173-82.adsl2.versatel.nl [82.173.182.1]) by spunkymail-a18.g.dreamhost.com (Postfix) with ESMTP id 2ADC65B52D; Sun, 23 Mar 2008 07:35:59 -0700 (PDT) User-Agent: Thunderbird 2.0.0.12 (Windows/20080213) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Johannes Schindelin wrote: > Hi, > > On Sun, 23 Mar 2008, Jonathan Watt wrote: > >> Johannes Schindelin wrote: >> >>> On Sun, 23 Mar 2008, Jonathan Watt wrote: >>> >>>> There seems to be a problem with git-push when the working copy of >>>> the directory being pushed to came from the magic revision HEAD, but >>>> not when the working copy came from some other revision. >>> http://git.or.cz/gitwiki/GitFaq#head-b96f48bc9c925074be9f95c0fce69bcece5f6e73 >>> >>> Sidenote: I am constantly amazed how people have no problem accepting >>> that a CVS-Server has no working directory, but all of a sudden think >>> that a Git-server should have one, and auto-update it. >> I think you've misread my email. (Or not read it. ;-)) > > Well, I did. Thank you very much. Then my apologies. It just seems that you answered a different question. >> I do not expect git-push to update the working copy of the repository >> being pushed to. In fact my complaint would be more that it *does* >> appear to modify the working copy (well, not so much modify the working >> copy as get confused about which revision the working copy came from) >> when the working copy came from HEAD. > > You changed the current branch via push. HEAD is the tip of the current > branch. What else should happen? I would expect it to do that, *and* note that the working copy didn't come from what is the new head of HEAD. > Your notion that the working tree has somehow a magic state that is not > dependent on the current branch is somewhat strange to me. I don't believe that's a notion that I have. I simply have a notion that git should know which revision the working copy was checked out from, and not get confused and think it came from a different revision. ;-) Jonathan