t7004: ship trustdb to avoid gpg warnings

diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index 42fcbc60caa3c369591d96c9d4d2913dbc2de397..71cbb72e1bc2e8b11c248c01cb7559e43ddabe04 100755 (executable)
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -26,7 +26,7 @@ test_bisection_diff()
 
        # Test if bisection size is close to half of list size within
        # tolerance.
-       # 
+       #
        _bisect_err=`expr $_list_size - $_bisection_size \* 2`
        test "$_bisect_err" -lt 0 && _bisect_err=`expr 0 - $_bisect_err`
        _bisect_err=`expr $_bisect_err / 2` ; # floor
@@ -58,7 +58,7 @@ on_committer_date "1971-08-16 00:00:15" save_tag a4 unique_commit a4 tree -p a3
 on_committer_date "1971-08-16 00:00:16" save_tag l3 unique_commit l3 tree -p a4
 on_committer_date "1971-08-16 00:00:17" save_tag l4 unique_commit l4 tree -p l3
 on_committer_date "1971-08-16 00:00:18" save_tag l5 unique_commit l5 tree -p l4
-tag l5 > .git/HEAD
+git-update-ref HEAD $(tag l5)
 
 
 #     E
@@ -116,8 +116,8 @@ on_committer_date "1971-08-16 00:00:06" save_tag V unique_commit V tree -p u1 -p
 
 test_sequence()
 {
-       _bisect_option=$1       
-       
+       _bisect_option=$1
+
        test_bisection_diff 0 $_bisect_option l0 ^root
        test_bisection_diff 0 $_bisect_option l1 ^root
        test_bisection_diff 0 $_bisect_option l2 ^root
@@ -152,9 +152,9 @@ test_sequence()
        test_bisection_diff 0 $_bisect_option u3 ^U
        test_bisection_diff 0 $_bisect_option u4 ^U
        test_bisection_diff 0 $_bisect_option u5 ^U
-       
+
 #
-# the following illustrate's Linus' binary bug blatt idea. 
+# the following illustrates Linus' binary bug blatt idea.
 #
 # assume the bug is actually at l3, but you don't know that - all you know is that l3 is broken
 # and it wasn't broken before
@@ -163,7 +163,7 @@ test_sequence()
 # the bisection point is the head - this is the bad point.
 #
 
-test_output_expect_success "--bisect l5 ^root" 'git-rev-list $_bisect_option l5 ^root' <<EOF
+test_output_expect_success "$_bisect_option l5 ^root" 'git-rev-list $_bisect_option l5 ^root' <<EOF
 c3
 EOF