aboutsummaryrefslogtreecommitdiff
path: root/t/t7502-commit.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-03 18:10:08 -0700
committerJunio C Hamano <gitster@pobox.com>2008-06-03 18:13:33 -0700
commita3c91e088ead7c47f43efe8da625d190dcef1001 (patch)
tree8abdb07b4885de6228fd64b0381edaaf4ba06195 /t/t7502-commit.sh
parent7845944c64de11d87e3b33ed7fa0a0a4b00fa435 (diff)
downloadgit-a3c91e088ead7c47f43efe8da625d190dcef1001.tar.gz
git-a3c91e088ead7c47f43efe8da625d190dcef1001.tar.xz
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>
Diffstat (limited to 't/t7502-commit.sh')
-rwxr-xr-xt/t7502-commit.sh35
1 files changed, 18 insertions, 17 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 385c8f46e..a5801df8b 100755
--- 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`