Merge branch 'jt/accept-capability-advertisement-when-fetching-from-void'

diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index ef0cbceafe855cfb7b0ce4d1cb5050875d587253..7a6e33e6732eaf69e298b56729ba4ead9ffaee0e 100755 (executable)
--- a/t/t6026-merge-attr.sh
+++ b/t/t6026-merge-attr.sh
@@ -181,4 +181,19 @@ test_expect_success 'up-to-date merge without common ancestor' '
        )
 '
 
+test_expect_success 'custom merge does not lock index' '
+       git reset --hard anchor &&
+       write_script sleep-one-second.sh <<-\EOF &&
+               sleep 1 &
+               echo $! >sleep.pid
+       EOF
+       test_when_finished "kill \$(cat sleep.pid)" &&
+
+       test_write_lines >.gitattributes \
+               "* 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
+'
+
 test_done