From: Andreas Schwab Date: Thu, 10 Nov 2016 08:31:18 +0000 (+0100) Subject: t6026-merge-attr: ensure that the merge driver was called X-Git-Tag: v2.11.0-rc1~7^2~4 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c1e0dc59bddce765761a6f863c66ee0cd4b2ca09?ds=inline;hp=--cc t6026-merge-attr: ensure that the merge driver was called Explicitly check for the existence of the pid file to test that the merge driver was actually called. Signed-off-by: Andreas Schwab Signed-off-by: Junio C Hamano --- c1e0dc59bddce765761a6f863c66ee0cd4b2ca09 diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 2672b15aa3..03d13d00b5 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -193,7 +193,8 @@ test_expect_success 'custom merge does not lock index' ' "* merge=ours" "text merge=sleep-one-second" && test_config merge.ours.driver true && test_config merge.sleep-one-second.driver ./sleep-one-second.sh && - git merge master + git merge master && + test -f sleep.pid ' test_done