Re: [PATCH v5] git-am: allow e-mail file(s) as input

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

 



Nicolas Sebrecht wrote:
> diff --git a/git-am.sh b/git-am.sh
> index d64d997..2b55ddc 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -162,6 +162,17 @@ check_patch_format () {
>  		return 0
>  	fi
>  
> +	# Then, accept what really looks like (series of) email(s).
> +	# the first sed select headers but the folded ones
> +	sed -e '/^$/q' -e '/^[[:blank:]]/d' "$1" |
> +	# this one is necessary for the next 'grep -v'
> +	sed -e '/^$/d' |
> +	grep -v -E -e '^[A-Za-z]+(-[A-Za-z]+)*:' ||
> +	{
> +		patch_format=mbox
> +		return 0
> +	}
> +
>  	# otherwise, check the first few lines of the first patch to try
>  	# to detect its format
>  	{

This fails t4150-am.sh #10 (am -3 -q is quiet). You should redirect the
output of the sed and grep to /dev/null like Junio did in his "how about
this" patch.

Also, writing some tests would be helpful.
--
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]