Re: git refuses to switch to older branches
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Aug 20, 2006, 18:46 UTC
- Message-ID
- <Pine.LNX.4.63.0608202044480.28360@wbgn013.biozentrum.uni-wuerzburg.de>
- In-Reply-To
- <20060820181511.GH30022@admingilde.org>
Hi,
On Sun, 20 Aug 2006, Martin Waitz wrote:
Show 29 quoted lines
> hoi :) > > On Sun, Aug 20, 2006 at 02:48:34PM +0200, Johannes Schindelin wrote: > > On Sun, 20 Aug 2006, Martin Waitz wrote: > > > On Sun, Aug 20, 2006 at 12:44:57AM +0200, Petr Baudis wrote: > > > > Dear diary, on Sun, Aug 20, 2006 at 12:39:20AM CEST, I got a letter > > > > where Junio C Hamano <junkio@cox.net> said that... > > > > > But I would suggest you to be _extremely_ careful if you want to > > > > > try this. I do not have an example offhand, but I would not be > > > > > surprised at all if there is a valid use case where it is useful > > > > > to have a pattern that matches a tracked file in .gitignore > > > > > file. > > > > > > > > *.o and binary blobs of closed-source software. > > > > > > but if you want to switch from one branch which has the .o file > > > built from source to another branch which has the .o file tracked > > > in binary form, wouldn't you want to remove the generated file > > > in order to store the tracked one from the new branch? > > > > Not necessarily. Sometimes you have files in your working directory, which > > are not in your repository, you know? > > Sure. But we are only talking about files which are explicitly > ignored in one branch and are tracked in another branch. > > Perhaps it makes sense to check that the file is _not_ ignored in the > other branch (in which it is tracked). > Would such a check make everybody happy?
Actually, I am very happy with the strict checking, and that I can override it with "-f".
Ciao, Dscho