t5604: make hash independent

To make our values hash independent, we turn the directory of the object
into "Y" and the file name into "Z" after having sorted items by their
name. However, when using SHA-256, one of our file names begins with an
"a" character, which means it sorts into the wrong place in the list,
causing the test to fail.

Since we don't care about the order of these items, just sort them after
stripping actual hash contents, which means they'll work with any hash
algorithm.

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

diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 4894237ab8059c83aea8aae50a0803ebf9df6831..0c74b4e21a3ef17499401cdd1f4eeaab5c392137 100755 (executable)
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -326,15 +326,16 @@ test_expect_success SYMLINKS 'clone repo with symlinked or unknown files at obje
        for raw in $(ls T*.raw)
        do
                sed -e "s!/../!/Y/!; s![0-9a-f]\{38,\}!Z!" -e "/commit-graph/d" \
-                   -e "/multi-pack-index/d" <$raw >$raw.de-sha || return 1
+                   -e "/multi-pack-index/d" <$raw >$raw.de-sha-1 &&
+               sort $raw.de-sha-1 >$raw.de-sha || return 1
        done &&
 
        cat >expected-files <<-EOF &&
        ./Y/Z
        ./Y/Z
+       ./Y/Z
        ./a-loose-dir/Z
        ./an-object
-       ./Y/Z
        ./info/packs
        ./pack/pack-Z.idx
        ./pack/pack-Z.pack