Re: [PATCH v3] Allow combined diff to ignore white-spaces

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 14, 2013, 21:43 UTC
Message-ID: <7v1ubhy7wo.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1363294994-3127-1-git-send-email-apelisse@gmail.com>

Antoine Pelisse <apelisse@gmail.com> writes:

Show 20 quoted lines

> +test_expect_success 'check combined output (no ignore space)' '
> +	git show >actual.tmp &&
> +	sed -e "1,/^@@@/d" < actual.tmp >actual &&
> +	tr -d Q <<-\EOF >expected &&
> +	--always coalesce
> +	- eol space coalesce
> +	- space change coalesce
> +	- all spaces coalesce
> +	- eol spaces
> +	- space change
> +	- all spaces
> +	 -eol space coalesce Q
> +	 -space  change coalesce
> +	 -all spa ces coalesce
> +	+ eol spaces Q
> +	+ space  change
> +	+ all spa ces
> +	EOF
> +	compare_diff_patch expected actual
> +'

Nicely constructed ;-)

Thanks.