diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2013-05-10 15:10:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-10 17:25:43 (GMT) |
| commit | 083b99310978c6768d8e954c9bab1d3692a515a1 (patch) | |
| tree | 3110a383e2721ef774763d66afae479589a5ac77 /t/t4030-diff-textconv.sh | |
| parent | 6c374008b1a4e3b66469168aace47003e9771e2d (diff) | |
| download | git-083b99310978c6768d8e954c9bab1d3692a515a1.zip git-083b99310978c6768d8e954c9bab1d3692a515a1.tar.gz git-083b99310978c6768d8e954c9bab1d3692a515a1.tar.bz2 | |
show: honor --textconv for blobs
Currently, "diff" and "cat-file" for blobs honor "--textconv" options
(with the former defaulting to "--textconv" and the latter to
"--no-textconv") whereas "show" does not honor this option, even though
it takes diff options.
Make "show" on blobs honor "--textconv" when it is asked. The default
is not to apply textconv, which is in line with what "cat-file" does.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4030-diff-textconv.sh')
| -rwxr-xr-x | t/t4030-diff-textconv.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index 3950fc9..0ebb028 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -96,14 +96,14 @@ test_expect_success 'show blob produces binary' ' test_cmp expect actual ' -test_expect_failure 'show --textconv blob produces text' ' +test_expect_success 'show --textconv blob produces text' ' git show --textconv HEAD:file >actual && printf "0\\n1\\n" >expect && test_cmp expect actual ' -test_success 'show --no-textconv blob produces binary' ' - git show --textconv HEAD:file >actual && +test_expect_success 'show --no-textconv blob produces binary' ' + git show --no-textconv HEAD:file >actual && printf "\\0\\n\\01\\n" >expect && test_cmp expect actual ' |