summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-28 05:47:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-28 05:47:53 (GMT)
commitbfbc2fccfdff0fe189337de67e16fc132b8ee2a5 (patch)
treef08bb74506c440a64267b43675cdfcc4311fd345 /t
parent8174645831a4b2b0722469d4f360bc97da2e2a6a (diff)
parentcc0ea7c9e5c3d3bf9623415737b595c9d26b9b6d (diff)
downloadgit-bfbc2fccfdff0fe189337de67e16fc132b8ee2a5.zip
git-bfbc2fccfdff0fe189337de67e16fc132b8ee2a5.tar.gz
git-bfbc2fccfdff0fe189337de67e16fc132b8ee2a5.tar.bz2
Merge branch 'jk/diff-blob'
"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-xt/t8010-cat-file-filters.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t8010-cat-file-filters.sh b/t/t8010-cat-file-filters.sh
index d8242e4..0f86c19 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 <" &&