X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5515-fetch-merge-logic.sh;h=31c108161781165d5e32f08b95089086627eda64;hb=784c099a30368af4238e2713e6220688119239a1;hp=765c83fda7d91f66456fc2dc2299867059a66971;hpb=ba66c58637734a7a70196515a43328c2e92016c8;p=git.git

diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 765c83fda..31c108161 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -84,8 +84,7 @@ test_expect_success setup '
 		git config branch.br-$remote-merge.merge refs/heads/three &&
 		git config branch.br-$remote-octopus.remote $remote &&
 		git config branch.br-$remote-octopus.merge refs/heads/one &&
-		git config --add branch.br-$remote-octopus.merge two &&
-		git config --add branch.br-$remote-octopus.merge remotes/rem/three
+		git config --add branch.br-$remote-octopus.merge two
 	done
 '
 
@@ -114,6 +113,7 @@ done >> tests
 # neither in the Pull: or .fetch config
 for branch in master br-unconfig ; do
     cat <<EOF
+$branch ../.git
 $branch ../.git one
 $branch ../.git one two
 $branch --tags ../.git
@@ -148,7 +148,7 @@ do
 		} >"$actual" &&
 		if test -f "$expect"
 		then
-			diff -u "$expect" "$actual" &&
+			git diff -u "$expect" "$actual" &&
 			rm -f "$actual"
 		else
 			# this is to help developing new tests.