kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <schwab@suse.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Andreas Schwab 2016-11-10 09:31:18 +01:00 committed by Junio C Hamano
parent 734fde2d71
commit c1e0dc59bd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/t6026-merge-attr.sh
View File

@ -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