t4042: choose the built-in hash outside of a repo

Right now, the built-in default hash is always SHA-1, but that will
change in a future commit.  Instead of assuming that operating outside
of a repository will always use SHA-1, provide constants for both
algorithms and then simply ask test_oid for the built-in hash instead,
which will always be correct.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4042-diff-textconv-caching.sh b/t/t4042-diff-textconv-caching.sh
index ff0e73531b90ed857e729382b41a60401302e34d..31018ceba288d0b7f6a7767437ae25653b7fb72d 100755 (executable)
--- a/t/t4042-diff-textconv-caching.sh
+++ b/t/t4042-diff-textconv-caching.sh
@@ -120,6 +120,14 @@ test_expect_success 'log notes cache and still use cache for -p' '
 '
 
 test_expect_success 'caching is silently ignored outside repo' '
+       test_oid_cache <<-\EOM &&
+       oid1 sha1:5626abf
+       oid1 sha256:a4ed1f3
+       oid2 sha1:f719efd
+       oid2 sha256:aa9e7dc
+       EOM
+       oid1=$(test_oid --hash=builtin oid1) &&
+       oid2=$(test_oid --hash=builtin oid2) &&
        mkdir -p non-repo &&
        echo one >non-repo/one &&
        echo two >non-repo/two &&
@@ -129,9 +137,9 @@ test_expect_success 'caching is silently ignored outside repo' '
                   -c diff.test.textconv="tr a-z A-Z <" \
                   -c diff.test.cachetextconv=true \
                   diff --no-index one two >actual &&
-       cat >expect <<-\EOF &&
+       cat >expect <<-EOF &&
        diff --git a/one b/two
-       index 5626abf..f719efd 100644
+       index $oid1..$oid2 100644
        --- a/one
        +++ b/two
        @@ -1 +1 @@