Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t6026-merge-attr: ensure that the merge driver was called
author
Andreas Schwab
<schwab@suse.de>
Thu, 10 Nov 2016 08:31:18 +0000
(09:31 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 10 Nov 2016 19:20:56 +0000
(11:20 -0800)
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>
t/t6026-merge-attr.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
734fde2
)
diff --git
a/t/t6026-merge-attr.sh
b/t/t6026-merge-attr.sh
index 2672b15aa3d0df9ad45027bbc91c1c66b4b5c199..03d13d00b5a249bd3aae89131cbeddac0e054bf1 100755
(executable)
--- 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