Re: Using Format/export-subst Howto.

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Sep 14, 2012, 15:06 UTC
Message-ID: <5053480E.2010002@viscovery.net>
In-Reply-To: <50532B35.9050607@drmicha.warpmail.net>

Am 9/14/2012 15:03, schrieb Michael J Gruber:

Show 16 quoted lines

> "git replaces $Id$... upon checkout.  Any byte sequence that begins
> with $Id: and ends with $ in the worktree file is replaced with $Id$
> upon check-in."
> 
> Now, the there are two problems after you add $Id$ and check-in
> (commit):
> 
> - commit does not check out, i.e. your work-tree copy is not updated 
> with expanded $Id$ - Not even "git checkout thatFile" updates your
> work-tree copy.
> 
> The first one could be considered OK, but at least the second one
> seems to be a bug. Together they create the following problem: Say,
> you've corrected that problem (rm that file and checkout) and then
> update your file, add and commit. It will keeping having the old (now
> wrong) Id expansion.

If EOL conversion or a clean filter was applied during 'git add file', is the version in the worktree suddenly wrong? Of course, not.

I would place $Id$ treatment in the same ball park and declare it as a mistake of the editor that it did not remove the now "wrong" SHA1 from $Id:$.

> We should do something about this.

Not necessary, IMHO.

-- Hannes