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>

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 385c8f46e1412cb9d794e4e51912fc0d7725bfac..a5801df8b68f654a0a8fa972b3fc0acc75fe071d 100755 (executable)
--- a/t/t7502-commit.sh
+++ b/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
-       echo f>g
-       git add g
-       git commit -myes
-       git branch second
-       echo master>g
-       echo g>h
-       git add g h
-       git commit -mmaster
-       git checkout second
-       echo second>g
-       git add g
-       git commit -msecond
-       git cherry-pick -n master
-       echo "editor not started" > .git/result
-       GIT_EDITOR=`pwd`/.git/FAKE_EDITOR git commit && exit 1  # should fail
-       test "`cat .git/result`" = "editor not started"
+       git clean -f &&
+       echo f >g &&
+       git add g &&
+       git commit -m "add g" &&
+       git branch second &&
+       echo master >g &&
+       echo g >h &&
+       git add g h &&
+       git commit -m "modify g and add h" &&
+       git checkout second &&
+       echo second >g &&
+       git add g &&
+       git commit -m second &&
+       # Must fail due to conflict
+       test_must_fail git cherry-pick -n master &&
+       echo "editor not started" >.git/result &&
+       test_must_fail GIT_EDITOR="$(pwd)/.git/FAKE_EDITOR" git commit &&
+       test "$(cat .git/result)" = "editor not started"
 '
 
 pwd=`pwd`