From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Waitz Subject: git refuses to switch to older branches Date: Sat, 19 Aug 2006 22:25:58 +0200 Message-ID: <20060819202558.GE30022@admingilde.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="tEFtbjk+mNEviIIX" X-From: git-owner@vger.kernel.org Sat Aug 19 22:26:07 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 1GEXOO-00066x-0m for gcvg-git@gmane.org; Sat, 19 Aug 2006 22:26:04 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422773AbWHSU0A (ORCPT ); Sat, 19 Aug 2006 16:26:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1422775AbWHSU0A (ORCPT ); Sat, 19 Aug 2006 16:26:00 -0400 Received: from agent.admingilde.org ([213.95.21.5]:57746 "EHLO mail.admingilde.org") by vger.kernel.org with ESMTP id S1422773AbWHSUZ7 (ORCPT ); Sat, 19 Aug 2006 16:25:59 -0400 Received: from martin by mail.admingilde.org with local (Exim 4.50 #1) id 1GEXOI-0003YV-NG for git@vger.kernel.org; Sat, 19 Aug 2006 22:25:58 +0200 To: git@vger.kernel.org Content-Disposition: inline X-PGP-Fingerprint: B21B 5755 9684 5489 7577 001A 8FF1 1AC5 DFE8 0FB2 User-Agent: Mutt/1.5.9i Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --tEFtbjk+mNEviIIX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable hoi :) 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? --=20 Martin Waitz --tEFtbjk+mNEviIIX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFE53PWj/Eaxd/oD7IRAiKlAJ99mmz+V/BIQxf1F5tSBSbZhrkQqACcCRn+ 3SAirCMfEekRkXOV12513LE= =30sB -----END PGP SIGNATURE----- --tEFtbjk+mNEviIIX--