cat-file: do not die on --textconv without textconv filters

When a command is supposed to use textconv filters (by default or with
"--textconv") and none are configured then the blob is output without
conversion; the only exception to this rule is "cat-file --textconv".

Make it behave like the rest of textconv aware commands.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 40f87b4649aa97ca1f33a02f09f5938ce5f41f74..fbaa1213f16fef0911ff3c1b2bf1cc3350105022 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -115,6 +115,14 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
        case 'e':
                return !has_sha1_file(sha1);
 
        case 'e':
                return !has_sha1_file(sha1);
 

+       case 'c':
+               if (!obj_context.path[0])
+                       die("git cat-file --textconv %s: <object> must be <sha1:path>",
+                           obj_name);
+
+               if (textconv_object(obj_context.path, obj_context.mode, sha1, 1, &buf, &size))
+                       break;
+

        case 'p':
                type = sha1_object_info(sha1, NULL);
                if (type < 0)
        case 'p':
                type = sha1_object_info(sha1, NULL);
                if (type < 0)


@@ -141,16 +149,6 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
                /* otherwise just spit out the data */
                break;
 
                /* otherwise just spit out the data */
                break;
 

-       case 'c':
-               if (!obj_context.path[0])
-                       die("git cat-file --textconv %s: <object> must be <sha1:path>",
-                           obj_name);
-
-               if (!textconv_object(obj_context.path, obj_context.mode, sha1, 1, &buf, &size))
-                       die("git cat-file --textconv: unable to run textconv on %s",
-                           obj_name);
-               break;
-

        case 0:
                if (type_from_string(exp_type) == OBJ_BLOB) {
                        unsigned char blob_sha1[20];
        case 0:
                if (type_from_string(exp_type) == OBJ_BLOB) {
                        unsigned char blob_sha1[20];

diff --git a/t/t8007-cat-file-textconv.sh b/t/t8007-cat-file-textconv.sh
index 78a0085e648b8fa6773b47e86959853cf29ccdf9..83c663678f5700f994da1508dbfb4529597b751d 100755 (executable)
--- a/t/t8007-cat-file-textconv.sh
+++ b/t/t8007-cat-file-textconv.sh
@@ -22,11 +22,11 @@ test_expect_success 'setup ' '
 '
 
 cat >expected <<EOF
 '
 
 cat >expected <<EOF

-fatal: git cat-file --textconv: unable to run textconv on :one.bin
+bin: test version 2

 EOF
 
 test_expect_success 'no filter specified' '
 EOF
 
 test_expect_success 'no filter specified' '

-       git cat-file --textconv :one.bin 2>result
+       git cat-file --textconv :one.bin >result &&

        test_cmp expected result
 '
 
        test_cmp expected result
 '
 


@@ -36,10 +36,6 @@ test_expect_success 'setup textconv filters' '
        git config diff.test.cachetextconv false
 '
 
        git config diff.test.cachetextconv false
 '
 

-cat >expected <<EOF
-bin: test version 2
-EOF
-

 test_expect_success 'cat-file without --textconv' '
        git cat-file blob :one.bin >result &&
        test_cmp expected result
 test_expect_success 'cat-file without --textconv' '
        git cat-file blob :one.bin >result &&
        test_cmp expected result


@@ -73,25 +69,19 @@ test_expect_success 'cat-file --textconv on previous commit' '
 '
 
 test_expect_success SYMLINKS 'cat-file without --textconv (symlink)' '
 '
 
 test_expect_success SYMLINKS 'cat-file without --textconv (symlink)' '

+       printf "%s" "one.bin" >expected &&

        git cat-file blob :symlink.bin >result &&
        git cat-file blob :symlink.bin >result &&

-       printf "%s" "one.bin" >expected

        test_cmp expected result
 '
 
 
 test_expect_success SYMLINKS 'cat-file --textconv on index (symlink)' '
        test_cmp expected result
 '
 
 
 test_expect_success SYMLINKS 'cat-file --textconv on index (symlink)' '

-       ! git cat-file --textconv :symlink.bin 2>result &&
-       cat >expected <<\EOF &&
-fatal: git cat-file --textconv: unable to run textconv on :symlink.bin
-EOF
+       git cat-file --textconv :symlink.bin >result &&

        test_cmp expected result
 '
 
 test_expect_success SYMLINKS 'cat-file --textconv on HEAD (symlink)' '
        test_cmp expected result
 '
 
 test_expect_success SYMLINKS 'cat-file --textconv on HEAD (symlink)' '

-       ! git cat-file --textconv HEAD:symlink.bin 2>result &&
-       cat >expected <<EOF &&
-fatal: git cat-file --textconv: unable to run textconv on HEAD:symlink.bin
-EOF
+       git cat-file --textconv HEAD:symlink.bin >result &&

        test_cmp expected result
 '
 
        test_cmp expected result
 '