From: Peter Krefting Date: Wed, 12 Aug 2009 06:54:44 GMT Subject: Re: Implementing $Date$ substitution - problem with git status Message-ID: In-Reply-To: <200908092252.58363.j6t@kdbg.org> Johannes Sixt: >> Doing "git reset --hard" or "git checkout master filename" does not >> help, the file is still believed to be modified by git. > Now, that's an entirely different problem, and I think that there is a > bug. I have observed this as well with my own clean filter sometimes, but > not always. I haven't found a recipe that reliably exhibits the problem. After som examination, it seems to be caused by the way I imported the CVS history: I kept all the $ keywords expanded in history (so that if I check out an old version from Git, it looks like it did in CVS). This means that still in the latest revision of several files, I have "$Id$" lines checked in in CVS format. However, as I have set the "ident" attribute, Git wants to expand it itself and check in files with "$Id$". When I do a reset, it seems it records the entry as clean against a version stored with just "$Id$", but the record in history has an expanded "$Id$", and the entry is thus never deemed clean. I can probably work around this by removing the "$Id$" attributes, or by removing the "ident" rule. -- \\// Peter - http://www.softwolves.pp.se/