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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



"Henrik Grubbström (Grubba)"  <grubba@xxxxxxxxxx> 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...
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]