From mboxrd@z Thu Jan 1 00:00:00 1970 From: david@lang.hm Subject: Re: .gittattributes handling has deficiencies Date: Sun, 21 Oct 2007 17:05:34 -0700 (PDT) Message-ID: References: <1192956535617-git-send-email-prohaska@zib.de> <1A07FEE6-88D8-4ED7-BEFD-F7F3B71310A5@zib.de> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: git@vger.kernel.org To: Steffen Prohaska X-From: git-owner@vger.kernel.org Mon Oct 22 02:00:09 2007 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 1IjkiG-0003rX-FA for gcvg-git-2@gmane.org; Mon, 22 Oct 2007 02:00:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751154AbXJUX75 (ORCPT ); Sun, 21 Oct 2007 19:59:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751258AbXJUX74 (ORCPT ); Sun, 21 Oct 2007 19:59:56 -0400 Received: from dsl081-033-126.lax1.dsl.speakeasy.net ([64.81.33.126]:43236 "EHLO bifrost.lang.hm" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751017AbXJUX74 (ORCPT ); Sun, 21 Oct 2007 19:59:56 -0400 Received: from asgard.lang.hm (asgard.lang.hm [10.0.0.100]) by bifrost.lang.hm (8.13.4/8.13.4/Debian-3) with ESMTP id l9LNxtHm001076; Sun, 21 Oct 2007 16:59:55 -0700 X-X-Sender: dlang@asgard.lang.hm In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: On Sun, 21 Oct 2007, david@lang.hm wrote: >>>> >>>> What do you mean by "checking out everything"? >>>> Which command do you propose? >>> >>> something like git checkout -f >> >> I suspected this. I see two problems: >> >> 1) it's too dangerous: I throws away _all_ changes, not only >> changes that are related to gitattributes. > > this is true, the question of if this is 'too dangerous' depends on what > workflow you teach as safe. if you teach that checking out a new version will > loose any modifications you have made (which is useually the sane thing to do > by default anyway) then this is just more of the same > >> 2) it doesn't work reliably. git checkout -f will only update >> files that git detects as changed. But you could have files that >> should have crlf in the working copy but actually have only lf. >> Those would not be updated. > > ok, you could do rm -r * before doing the checkout -f (or there's probably a > option to git to tell it not to preserve changes to the working area, I am > not a git guru. > >> I'll not recommend this. Not using .gitattributes is the only >> sane solution. > > it may be the best thing to do for you and your users, that's not the same > thing as saying that it's the only sane solution. by the way, I am not saying that my suggestion is the right way for things to be (especially long term), but I'm trying to figure out a work-around for the short term. I'm very interested to see the logn-term suggestions, becouse I suspect that modt of them could be leveraged for the metastore jobs. David Lang