X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5515-fetch-merge-logic.sh;h=1f4608d8ba4748a2bd5c7a3d5a75a04364e8f646;hb=3fee1fe87144360a1913eab86af9ad136c810076;hp=8becbc3f38fde02371ebbcd9a39a320a1c00c290;hpb=948e7471e03340307e802e919303256f80273d21;p=git.git diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 8becbc3f3..1f4608d8b 100755 --- a/t/t5515-fetch-merge-logic.sh +++ b/t/t5515-fetch-merge-logic.sh @@ -131,9 +131,9 @@ do test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'` cnt=`expr $test_count + 1` pfx=`printf "%04d" $cnt` - expect_f="../../t5515/fetch.$test" + expect_f="$TEST_DIRECTORY/t5515/fetch.$test" actual_f="$pfx-fetch.$test" - expect_r="../../t5515/refs.$test" + expect_r="$TEST_DIRECTORY/t5515/refs.$test" actual_r="$pfx-refs.$test" test_expect_success "$cmd" '