diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:36:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-09 10:36:36 -0800 |
| commit | a59c87265b917eb0d1b95c73ed829d47ee2ded6b (patch) | |
| tree | bcb2e1e97d65799dbc35fefc769747c52b794cbf /t | |
| parent | 5605685a71bd65548dab56e457b15d365b4350b4 (diff) | |
| parent | aae1f6acf1984f4ae4453ad299a1fa4d261fb188 (diff) | |
| download | git-a59c87265b917eb0d1b95c73ed829d47ee2ded6b.tar.gz git-a59c87265b917eb0d1b95c73ed829d47ee2ded6b.tar.xz | |
Merge branch 'fc/apply-p2-get-header-name' into maint
* fc/apply-p2-get-header-name:
test: git-apply -p2 rename/chmod only
Fix git-apply with -p greater than 1
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4120-apply-popt.sh | 26 |
1 files changed, 26 insertions, 0 deletions
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 |