t1405: sort reflog entries in a hash-independent way
The test enumerates reflog entries in an arbitrary order and then sorts them. For SHA-1, this produces results that happen to sort in alphabetical order, but for other hash algorithms they sort differently. Ensure we sort the reflog entries in a hash-independent way by sorting on the ref name instead of the object ID. Remove an assumption about the length of a hash by using cut with the delimiter and field options instead of the character range option. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Mar 25, 2018 at 19:20 UTC
64af7752bb3682200da0e7d3c8fc0821d2609566
1 file changed
+2
-2
t/t1405-main-ref-store.sh
+2
-2
@@ -45,7 +45,7 @@ test_expect_success 'rename_refs(master, new-master)' '
45
'
46
47
test_expect_success 'for_each_ref(refs/heads/)' '
48
- $RUN for-each-ref refs/heads/ | cut -c 42- >actual &&
48
+ $RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
49
cat >expected <<-\EOF &&
50
master 0x0
51
new-master 0x0
@@ -71,7 +71,7 @@ test_expect_success 'verify_ref(new-master)' '
71
'
72
73
test_expect_success 'for_each_reflog()' '
74
- $RUN for-each-reflog | sort | cut -c 42- >actual &&
74
+ $RUN for-each-reflog | sort -k2 | cut -c 42- >actual &&
75
cat >expected <<-\EOF &&
76
HEAD 0x1
77
refs/heads/master 0x0