diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-18 08:19:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-18 08:19:01 +0300 |
| commit | 16ba0f44c0cac7c06cf7ce37498b8c83e0f3b69b (patch) | |
| tree | d139e7e06986cee72d0ab30fc758ab827770b283 /t | |
| parent | 501ec0dad31a5379ac7620f8655de882844fd3c1 (diff) | |
| parent | cc0ea7c9e5c3d3bf9623415737b595c9d26b9b6d (diff) | |
Merge branch 'jk/diff-blob' into maint
"git cat-file --textconv" started segfaulting recently, which
has been corrected.
* jk/diff-blob:
cat-file: handle NULL object_context.path
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8010-cat-file-filters.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t8010-cat-file-filters.sh b/t/t8010-cat-file-filters.sh index d8242e467e..0f86c19174 100755 --- a/t/t8010-cat-file-filters.sh +++ b/t/t8010-cat-file-filters.sh @@ -51,6 +51,11 @@ test_expect_success '--path=<path> complains without --textconv/--filters' ' grep "path.*needs.*filters" err ' +test_expect_success '--textconv/--filters complain without path' ' + test_must_fail git cat-file --textconv HEAD && + test_must_fail git cat-file --filters HEAD +' + test_expect_success 'cat-file --textconv --batch works' ' sha1=$(git rev-parse -q --verify HEAD:world.txt) && test_config diff.txt.textconv "tr A-Za-z N-ZA-Mn-za-m <" && |