t7502: tighten loosely written test sequence

We would like to catch breakage at any step in the sequence.

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

t/t7502-commit.sh

@@ -196,23 +196,24 @@ chmod +x .git/FAKE_EDITOR
 
 test_expect_success 'do not fire editor in the presence of conflicts' '
 
-	git clean
+	git clean -f &&
-	echo f>g
+	echo f >g &&
-	git add g
+	git add g &&
-	git commit -myes
+	git commit -m "add g" &&
-	git branch second
+	git branch second &&
-	echo master>g
+	echo master >g &&
-	echo g>h
+	echo g >h &&
-	git add g h
+	git add g h &&
-	git commit -mmaster
+	git commit -m "modify g and add h" &&
-	git checkout second
+	git checkout second &&
-	echo second>g
+	echo second >g &&
-	git add g
+	git add g &&
-	git commit -msecond
+	git commit -m second &&
-	git cherry-pick -n master
+	# Must fail due to conflict
-	echo "editor not started" > .git/result
+	test_must_fail git cherry-pick -n master &&
-	GIT_EDITOR=`pwd`/.git/FAKE_EDITOR git commit && exit 1  # should fail
+	echo "editor not started" >.git/result &&
-	test "`cat .git/result`" = "editor not started"
+	test_must_fail GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" git commit &&
+	test "$(cat .git/result)" = "editor not started"
 '
 
 pwd=`pwd`