summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2018-03-25 19:20:49 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-26 15:10:48 -0700
commit64af7752bb3682200da0e7d3c8fc0821d2609566 (patch)
tree8fde8d656624c51d174738c47c8601c1d557e5ca /t
parentt1300: abstract away SHA-1-specific constants (diff)
downloadtgif-64af7752bb3682200da0e7d3c8fc0821d2609566.tar.xz
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>
Diffstat (limited to 't')
-rwxr-xr-xt/t1405-main-ref-store.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index e8115df5ba..a1e243a05c 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -45,7 +45,7 @@ test_expect_success 'rename_refs(master, new-master)' '
'
test_expect_success 'for_each_ref(refs/heads/)' '
- $RUN for-each-ref refs/heads/ | cut -c 42- >actual &&
+ $RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
cat >expected <<-\EOF &&
master 0x0
new-master 0x0
@@ -71,7 +71,7 @@ test_expect_success 'verify_ref(new-master)' '
'
test_expect_success 'for_each_reflog()' '
- $RUN for-each-reflog | sort | cut -c 42- >actual &&
+ $RUN for-each-reflog | sort -k2 | cut -c 42- >actual &&
cat >expected <<-\EOF &&
HEAD 0x1
refs/heads/master 0x0