diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:10 -0700 |
| commit | bb6ac5ea13250b295b4620face2ea5c0c9809b0b (patch) | |
| tree | d77b828c677f42830807ea42fe0cd4dd191deb4d /t/t4119-apply-config.sh | |
| parent | 04cd47f553796263451c946061e175d847f388c3 (diff) | |
| parent | 477a08af04c227064860ce99197c501037f7f39c (diff) | |
| download | git-bb6ac5ea13250b295b4620face2ea5c0c9809b0b.tar.gz | |
Merge branch 'jc/apply-ws-prefix' into maint
* jc/apply-ws-prefix:
apply: omit ws check for excluded paths
apply: hoist use_patch() helper for path exclusion up
apply: use the right attribute for paths in non-Git patches
Conflicts:
builtin/apply.c
Diffstat (limited to 't/t4119-apply-config.sh')
| -rwxr-xr-x | t/t4119-apply-config.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh index c393be691b..a9a0583811 100755 --- a/t/t4119-apply-config.sh +++ b/t/t4119-apply-config.sh @@ -159,4 +159,21 @@ test_expect_success 'same but with traditional patch input of depth 2' ' check_result sub/file1 ' +test_expect_success 'in subdir with traditional patch input' ' + cd "$D" && + git config apply.whitespace strip && + cat >.gitattributes <<-EOF && + /* whitespace=blank-at-eol + sub/* whitespace=-blank-at-eol + EOF + rm -f sub/file1 && + cp saved sub/file1 && + git update-index --refresh && + + cd sub && + git apply ../gpatch.file && + echo "B " >expect && + test_cmp expect file1 +' + test_done |