t7102: prepare expected output inside test_expect_* block

That way we can notice if there is a breakage/bug in the parts of
the test that prepare the expected outcome, which is how modern
tests are arranged.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/t7102-reset.sh

@@ -82,15 +82,15 @@ test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
 	test_i18ncmp .expected .actual
 '
 
->.diff_expect
+test_expect_success 'giving a non existing revision should fail' '
->.cached_expect
+	>.diff_expect &&
-cat >.cat_expect <<EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
 	secondfile:
 	1st line 2nd file
 	2nd line 2nd file
 	EOF
 
-test_expect_success 'giving a non existing revision should fail' '
 	test_must_fail git reset aaaaaa &&
 	test_must_fail git reset --mixed aaaaaa &&
 	test_must_fail git reset --soft aaaaaa &&
@@ -191,8 +191,9 @@ test_expect_success 'resetting to HEAD with no changes should succeed and do not
 		check_changes $head5
 '
 
->.diff_expect
+test_expect_success '--soft reset only should show changes in diff --cached' '
-cat >.cached_expect <<EOF
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
 	diff --git a/secondfile b/secondfile
 	index $head5p1s..$head5s 100644
 	--- a/secondfile
@@ -202,27 +203,26 @@ index $head5p1s..$head5s 100644
 	+1st line 2nd file
 	+2nd line 2nd file
 	EOF
-cat >.cat_expect <<EOF
+	cat >.cat_expect <<-\EOF &&
 	secondfile:
 	1st line 2nd file
 	2nd line 2nd file
 	EOF
-test_expect_success '--soft reset only should show changes in diff --cached' '
 	git reset --soft HEAD^ &&
 	check_changes $head5p1 &&
 	test "$(git rev-parse ORIG_HEAD)" = \
 			$head5
 '
 
->.diff_expect
+test_expect_success 'changing files and redo the last commit should succeed' '
->.cached_expect
+	>.diff_expect &&
-cat >.cat_expect <<EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
 	secondfile:
 	1st line 2nd file
 	2nd line 2nd file
 	3rd line 2nd file
 	EOF
-test_expect_success 'changing files and redo the last commit should succeed' '
 	echo "3rd line 2nd file" >>secondfile &&
 	git commit -a -C ORIG_HEAD &&
 	head4=$(git rev-parse --verify HEAD) &&
@@ -231,24 +231,25 @@ test_expect_success 'changing files and redo the last commit should succeed' '
 			$head5
 '
 
->.diff_expect
+test_expect_success '--hard reset should change the files and undo commits permanently' '
->.cached_expect
+	>.diff_expect &&
-cat >.cat_expect <<EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
 	first:
 	1st file
 	2nd line 1st file
 	second:
 	2nd file
 	EOF
-test_expect_success '--hard reset should change the files and undo commits permanently' '
 	git reset --hard HEAD~2 &&
 	check_changes $head5p2 &&
 	test "$(git rev-parse ORIG_HEAD)" = \
 			$head4
 '
 
->.diff_expect
+test_expect_success 'redoing changes adding them without commit them should succeed' '
-cat >.cached_expect <<EOF
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
 	diff --git a/first b/first
 	deleted file mode 100644
 	index $head5p2f..0000000
@@ -273,12 +274,11 @@ index 0000000..$head5s
 	+1st line 2nd file
 	+2nd line 2nd file
 	EOF
-cat >.cat_expect <<EOF
+	cat >.cat_expect <<-\EOF &&
 	secondfile:
 	1st line 2nd file
 	2nd line 2nd file
 	EOF
-test_expect_success 'redoing changes adding them without commit them should succeed' '
 	git rm first &&
 	git mv second secondfile &&
 
@@ -288,7 +288,8 @@ test_expect_success 'redoing changes adding them without commit them should succ
 	check_changes $head5p2
 '
 
-cat >.diff_expect <<EOF
+test_expect_success '--mixed reset to HEAD should unadd the files' '
+	cat >.diff_expect <<-EOF &&
 	diff --git a/first b/first
 	deleted file mode 100644
 	index $head5p2f..0000000
@@ -305,29 +306,27 @@ index $head5p1s..0000000
 	@@ -1 +0,0 @@
 	-2nd file
 	EOF
->.cached_expect
+	>.cached_expect &&
-cat >.cat_expect <<EOF
+	cat >.cat_expect <<-\EOF &&
 	secondfile:
 	1st line 2nd file
 	2nd line 2nd file
 	EOF
-test_expect_success '--mixed reset to HEAD should unadd the files' '
 	git reset &&
 	check_changes $head5p2 &&
 	test "$(git rev-parse ORIG_HEAD)" = $head5p2
 '
 
->.diff_expect
+test_expect_success 'redoing the last two commits should succeed' '
->.cached_expect
+	>.diff_expect &&
-cat >.cat_expect <<EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
 	secondfile:
 	1st line 2nd file
 	2nd line 2nd file
 	EOF
-test_expect_success 'redoing the last two commits should succeed' '
 	git add secondfile &&
 	git reset --hard $head5p2 &&
-
 	git rm first &&
 	git mv second secondfile &&
 	git commit -a -m "remove 1st and rename 2nd" &&
@@ -340,15 +339,15 @@ test_expect_success 'redoing the last two commits should succeed' '
 	check_changes $head5
 '
 
->.diff_expect
+test_expect_success '--hard reset to HEAD should clear a failed merge' '
->.cached_expect
+	>.diff_expect &&
-cat >.cat_expect <<EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
 	secondfile:
 	1st line 2nd file
 	2nd line 2nd file
 	3rd line in branch2
 	EOF
-test_expect_success '--hard reset to HEAD should clear a failed merge' '
 	git branch branch1 &&
 	git branch branch2 &&
 
@@ -366,14 +365,14 @@ test_expect_success '--hard reset to HEAD should clear a failed merge' '
 	check_changes $head3
 '
 
->.diff_expect
+test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge' '
->.cached_expect
+	>.diff_expect &&
-cat >.cat_expect <<EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
 	secondfile:
 	1st line 2nd file
 	2nd line 2nd file
 	EOF
-test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge' '
 	git reset --hard HEAD^ &&
 	check_changes $head5 &&
 
@@ -460,12 +459,11 @@ test_expect_success 'resetting an unmodified path is a no-op' '
 	git diff-index --cached --exit-code HEAD
 '
 
-cat >expect <<EOF
+test_expect_success '--mixed refreshes the index' '
+	cat >expect <<-\EOF &&
 	Unstaged changes after reset:
 	M	file2
 	EOF
-
-test_expect_success '--mixed refreshes the index' '
 	echo 123 >>file2 &&
 	git reset --mixed HEAD >output &&
 	test_i18ncmp expect output