Re: [PATCH] Fix git-apply with -p greater than 1

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 22, 2010, 05:31 UTC
Message-ID: <20101022053140.GB786@burratino>
In-Reply-To: <7viq0urfbz.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

Show 9 quoted lines

> +test_expect_success 'apply (-p2) diff, mode change only' '
> +	cat >patch.chmod <<-\EOF &&
> +	diff --git a/sub/file1 b/sub/file1
> +	old mode 100644
> +	new mode 100755
> +	EOF
> +	chmod 644 file1 &&
> +	git apply -p2 patch.chmod &&
> +	test -x file1

I had thought -p was only supposed to apply to traditional patches. Maybe a documentation update would avoid confusion?

	-p<n>
	   Remove <n> leading slashes from traditional diff paths.
	   The default is 1.