From: Henrik Grubbström Date: Tue, 09 Mar 2010 09:22:29 GMT Subject: Re: [PATCH 1/4] convert: Safer handling of $Id$ contraction. Message-ID: In-Reply-To: On Wed, 3 Mar 2010, Henrik Grubbström wrote: > On Tue, 2 Mar 2010, Junio C Hamano wrote: > >> Henrik Grubbström writes: >> >>> The code to contract $Id:xxxxx$ strings could eat an arbitrary amount >>> of source text if the terminating $ was lost. It now refuses to >>> contract $Id:xxxxx$ strings spanning multiple lines. >> >> Hmm, at least when going from working tree to the index, shouldn't the >> code refuse _and_ die(), instead of silently pass the garbage through? > > It depends; it could be part of some code that scans for the $Id: tag. > A warning might be appropriate though. A nonscientific survey of some version control systems gives: VCS Id-keyword Eats linefeed ------------------------------------------------- bzr no - cvs yes no, silent accept git(1.7.0) yes yes, silent hg yes(hgext) no, silent accept monotone no - rcs yes no, silent accept svn yes no, silent accept So it seems my original patch is in line with what other version control systems do. -- Henrik Grubbström grubba@grubba.org Roxen Internet Software AB grubba@roxen.com