From: Junio C Hamano Date: Fri, 22 Oct 2010 05:09:40 +0000 (-0700) Subject: test: git-apply -p2 rename/chmod only X-Git-Tag: v1.7.3.4~25^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aae1f6acf1984f4ae4453ad299a1fa4d261fb188;p=git.git test: git-apply -p2 rename/chmod only Signed-off-by: Junio C Hamano --- diff --git a/t/t4120-apply-popt.sh b/t/t4120-apply-popt.sh index 2b2d00b33..579c9e610 100755 --- a/t/t4120-apply-popt.sh +++ b/t/t4120-apply-popt.sh @@ -56,4 +56,30 @@ test_expect_success 'apply with too large -p and fancy filename' ' grep "removing 3 leading" err ' +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 +' + +test_expect_success 'apply (-p2) diff, rename' ' + cat >patch.rename <<-\EOF && + diff --git a/sub/file1 b/sub/file2 + similarity index 100% + rename from sub/file1 + rename to sub/file2 + EOF + echo A >expected && + + cp file1.saved file1 && + rm -f file2 && + git apply -p2 patch.rename && + test_cmp expected file2 +' + test_done