diff options
| author | Andreas Schwab <schwab@suse.de> | 2016-11-10 09:31:18 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-10 11:20:56 -0800 |
| commit | c1e0dc59bddce765761a6f863c66ee0cd4b2ca09 (patch) | |
| tree | e3d777926f35f8f50701733c585e1f3aa625a10f | |
| parent | 734fde2d7167e4b20d2ff6062ade3846949b0741 (diff) | |
| download | git-c1e0dc59bddce765761a6f863c66ee0cd4b2ca09.tar.gz | |
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>
| -rwxr-xr-x | t/t6026-merge-attr.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |