git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/4] convert: Safer handling of $Id$ contraction.

From
HGHenrik Grubbström <grubba@roxen.com>
Date
Mar 9, 2010, 09:22 UTC
Message-ID
<Pine.GSO.4.63.1003081951000.1164@shipon.roxen.com>
In-Reply-To
<Pine.GSO.4.63.1003031129340.1164@shipon.roxen.com>
On Wed, 3 Mar 2010, Henrik Grubbström wrote:
Show 13 quoted lines
> On Tue, 2 Mar 2010, Junio C Hamano wrote:
>
>> Henrik Grubbström <grubba@grubba.org> 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

Previous: Henrik Grubbström
Message 9 of 9 in “convert: Safer handling of $Id$ contraction.”
  1. 1/4 convert: Safer handling of $Id$ contraction.Henrik Grubbström, Mar 1, 2010
  2. 2/4 convert: Keep foreign $Id$ on checkout.Henrik Grubbström, Mar 1, 2010
  3. 3/4 convert: Inhibit contraction of foreign $Id$ during stats.Henrik Grubbström, Mar 1, 2010
  4. 4/4 convert: Added core.refilteronadd feature.Henrik Grubbström, Mar 1, 2010
  5. Junio C HamanoMar 3, 2010
  6. Henrik GrubbströmMar 3, 2010
  7. Junio C HamanoMar 3, 2010
  8. Henrik GrubbströmMar 3, 2010
  9. Henrik GrubbströmMar 9, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.