t1405: make hash size independent

bk2204 · gitster · commit 63477b328e43 · 2018-09-17T08:10:32.000-07:00
Instead of hard-coding a 40-based constant, split the output of
for-each-ref and for-each-reflog by field.

Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
@@ -54,7 +54,7 @@ test_expect_success 'for_each_ref(refs/heads/)' '
 '
 
 test_expect_success 'for_each_ref() is sorted' '
-	$RUN for-each-ref refs/heads/ | cut -c 42- >actual &&
+	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
 	sort actual > expected &&
 	test_cmp expected actual
 '
@@ -71,7 +71,7 @@ test_expect_success 'verify_ref(new-master)' '
 '
 
 test_expect_success 'for_each_reflog()' '
-	$RUN for-each-reflog | sort -k2 | cut -c 42- >actual &&
+	$RUN for-each-reflog | sort -k2 | cut -d" " -f 2- >actual &&
 	cat >expected <<-\EOF &&
 	HEAD 0x1
 	refs/heads/master 0x0

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ test_expect_success 'for_each_ref(refs/heads/)' '`
`54`	`54`	`'`
`55`	`55`
`56`	`56`	`test_expect_success 'for_each_ref() is sorted' '`
`57`		`- $RUN for-each-ref refs/heads/ \| cut -c 42- >actual &&`
	`57`	`+ $RUN for-each-ref refs/heads/ \| cut -d" " -f 2- >actual &&`
`58`	`58`	`sort actual > expected &&`
`59`	`59`	`test_cmp expected actual`
`60`	`60`	`'`
`@@ -71,7 +71,7 @@ test_expect_success 'verify_ref(new-master)' '`
`71`	`71`	`'`
`72`	`72`
`73`	`73`	`test_expect_success 'for_each_reflog()' '`
`74`		`- $RUN for-each-reflog \| sort -k2 \| cut -c 42- >actual &&`
	`74`	`+ $RUN for-each-reflog \| sort -k2 \| cut -d" " -f 2- >actual &&`
`75`	`75`	`cat >expected <<-\EOF &&`
`76`	`76`	`HEAD 0x1`
`77`	`77`	`refs/heads/master 0x0`