From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Narebski Subject: Re: git refuses to switch to older branches Date: Sat, 19 Aug 2006 23:47:09 +0200 Organization: At home Message-ID: References: <20060819202558.GE30022@admingilde.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit X-From: git-owner@vger.kernel.org Sat Aug 19 23:50:12 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 1GEYhn-0004bz-PP for gcvg-git@gmane.org; Sat, 19 Aug 2006 23:50:12 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030318AbWHSVuF (ORCPT ); Sat, 19 Aug 2006 17:50:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751847AbWHSVuF (ORCPT ); Sat, 19 Aug 2006 17:50:05 -0400 Received: from main.gmane.org ([80.91.229.2]:59342 "EHLO ciao.gmane.org") by vger.kernel.org with ESMTP id S1751846AbWHSVuD (ORCPT ); Sat, 19 Aug 2006 17:50:03 -0400 Received: from root by ciao.gmane.org with local (Exim 4.43) id 1GEYhe-0004am-Gk for git@vger.kernel.org; Sat, 19 Aug 2006 23:50:02 +0200 Received: from host-81-190-24-244.torun.mm.pl ([81.190.24.244]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 19 Aug 2006 23:50:02 +0200 Received: from jnareb by host-81-190-24-244.torun.mm.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 19 Aug 2006 23:50:02 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: git@vger.kernel.org X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: host-81-190-24-244.torun.mm.pl Mail-Copies-To: jnareb@gmail.com User-Agent: KNode/0.10.2 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Martin Waitz wrote: > now that gitweb.cgi is autogenerated, git refuses to switch to old > branches unless force is applied: > > fatal: Untracked working tree file 'gitweb/gitweb.cgi' would > be overwritten by merge. > > This safety measure is quite useful normally, but for files that are > explicitly marked as to-be-ignored it should not be neccessary. > > But all the code that handles .gitignore is only used by ls-files now. > Does it make sense to add exclude handling to unpack-trees.c, too? I think it is "better to be annoying but safe" idea of git. You can always do "git checkout gitweb/gitweb.cgi" and "git checkout ", and not use -f. Or add gitweb.cgi to .gitignore in the old branch. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git