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

Re: [PATCH 4/5] convert: Inhibit contraction of foreign $Id$ during stats.

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 1, 2010, 19:56 UTC
Message-ID
<7v634bosjg.fsf@alter.siamese.dyndns.org>
In-Reply-To
<81e71814080d0eca72809a751e4e90026f8fe0ea.1269860022.git.grubba@grubba.org>
"Henrik Grubbström (Grubba)"  <grubba@grubba.org> writes:
Show 17 quoted lines
> @@ -462,6 +463,20 @@ static int ident_to_git(const char *path, const char *src, size_t len,
>  				continue;
>  			}
>  
> +			if ((identmode == IDENT_MODE_KEEP_FOREIGN) && len > 5) {
> +				spc = memchr(src + 4, ' ', dollar - src - 4);
> +				if (spc && spc < dollar-1) {
> +					/* Foreign id.
> +					 * Contraction of these is inhibited
> +					 * during status operations to avoid
> +					 * all files containing such being
> +					 * marked as modified on checkout.
> +					 * cf sha1_file.c:index_mem().
> +					 */
> +					continue;
> +				}
> +			}

Somehow this feels to me that it is applying a band-aid to solve a problem that does not exist, only because the second patch in this series to keep the foreign one left expanded were not such a good change after all...

Previous: Stephen R. van den BergNext: Henrik Grubbström
Message 9 of 14 in “ident attribute related patches (resend w/ testsuite v3)”
  1. 0/5 ident attribute related patches (resend w/ testsuite v3)Henrik Grubbström (Grubba), Mar 29, 2010
  2. 1/5 convert: Safer handling of $Id$ contraction.Henrik Grubbström (Grubba), Mar 29, 2010
  3. 2/5 convert: Keep foreign $Id$ on checkout.Henrik Grubbström (Grubba), Mar 29, 2010
  4. 3/5 convert: Use the enum constant SAFE_CRLF_FALSE.Henrik Grubbström (Grubba), Mar 29, 2010
  5. 4/5 convert: Inhibit contraction of foreign $Id$ during stats.Henrik Grubbström (Grubba), Mar 29, 2010
  6. 5/5 convert: Added core.refilteronadd feature.Henrik Grubbström (Grubba), Mar 29, 2010
  7. Stephen R. van den BergMar 29, 2010
  8. Stephen R. van den BergMar 29, 2010
  9. Junio C HamanoApr 1, 2010
  10. Henrik GrubbströmApr 6, 2010
  11. Stephen R. van den BergMar 29, 2010
  12. Junio C HamanoApr 1, 2010
  13. Stephen R. van den BergMar 29, 2010
  14. Stephen R. van den BergMar 29, 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.