Merge branch 'jc/maint-fetch-regression-1.5.4'

* jc/maint-fetch-regression-1.5.4:
  git-fetch test: test tracking fetch results, not just FETCH_HEAD
  Fix branches file configuration
  Tighten refspec processing
  Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.

1 files changed, 19 insertions, 7 deletions

diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 31c1081617..65c37744aa 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -131,8 +131,10 @@ do
 	test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
 	cnt=`expr $test_count + 1`
 	pfx=`printf "%04d" $cnt`
-	expect="../../t5515/fetch.$test"
-	actual="$pfx-fetch.$test"
+	expect_f="../../t5515/fetch.$test"
+	actual_f="$pfx-fetch.$test"
+	expect_r="../../t5515/refs.$test"
+	actual_r="$pfx-refs.$test"
 
 	test_expect_success "$cmd" '
 		{
@@ -145,14 +147,24 @@ do
 			rm -f .git/refs/tags/*
 			git fetch "$@" >/dev/null
 			cat .git/FETCH_HEAD
-		} >"$actual" &&
-		if test -f "$expect"
+		} >"$actual_f" &&
+		git show-ref >"$actual_r" &&
+		if test -f "$expect_f"
 		then
-			git diff -u "$expect" "$actual" &&
-			rm -f "$actual"
+			git diff -u "$expect_f" "$actual_f" &&
+			rm -f "$actual_f"
 		else
 			# this is to help developing new tests.
-			cp "$actual" "$expect"
+			cp "$actual_f" "$expect_f"
+			false
+		fi &&
+		if test -f "$expect_r"
+		then
+			git diff -u "$expect_r" "$actual_r" &&
+			rm -f "$actual_r"
+		else
+			# this is to help developing new tests.
+			cp "$actual_r" "$expect_r"
 			false
 		fi
 	'