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 14:54:50 +0100 Message-ID: <47E6612A.5020408@jwatt.org> References: <47E64F71.3020204@jwatt.org> <47E658D3.1060104@jwatt.org> <51419b2c0803230645l5b07bbf5h9cbf9b6f47373efa@mail.gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Johannes Schindelin , git@vger.kernel.org To: Elijah Newren X-From: git-owner@vger.kernel.org Sun Mar 23 14:55:43 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 1JdQfj-00031s-5K for gcvg-git-2@gmane.org; Sun, 23 Mar 2008 14:55:39 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756468AbYCWNy6 (ORCPT ); Sun, 23 Mar 2008 09:54:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758840AbYCWNy6 (ORCPT ); Sun, 23 Mar 2008 09:54:58 -0400 Received: from sd-green-bigip-145.dreamhost.com ([208.97.132.145]:33656 "EHLO spunkymail-a17.g.dreamhost.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756412AbYCWNy5 (ORCPT ); Sun, 23 Mar 2008 09:54:57 -0400 Received: from [192.168.1.6] (ip1-182-173-82.adsl2.versatel.nl [82.173.182.1]) by spunkymail-a17.g.dreamhost.com (Postfix) with ESMTP id 657EF73CF4; Sun, 23 Mar 2008 06:54:55 -0700 (PDT) User-Agent: Thunderbird 2.0.0.12 (Windows/20080213) In-Reply-To: <51419b2c0803230645l5b07bbf5h9cbf9b6f47373efa@mail.gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Elijah Newren wrote: > On Sun, Mar 23, 2008 at 7:19 AM, Jonathan Watt wrote: >> Johannes Schindelin wrote: >> > Hi, >> > >> > 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. >> >> Hi Dscho. I think you've misread my email. (Or not read it. ;-)) 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. > > Ah, I hadn't thought of it that way before. I think you are > suggesting that pushing to the active branch of a repository with an > associated working copy should cause the HEAD to become detached. Is > that right? To be honest, I'm not sure what you mean by "HEAD to become detached". If you mean that the git-push should, if necessary, stop associating the working copy with HEAD if it's going to change HEAD, then absolutely. It wasn't the same solution as I was thinking of (stop associating the working copy with HEAD and instead associate it with the sha1 HEAD currently points to), but I guess it's the same result. :-) Jonathan