From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 01 Apr 2010 19:56:51 GMT
Subject: Re: [PATCH 4/5] convert: Inhibit contraction of foreign $Id$ during stats.
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:

> @@ -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...