summaryrefslogtreecommitdiff
path: root/t/t6427-diff3-conflict-markers.sh
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2022-03-17 11:13:09 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-17 08:40:26 -0700
commitee32abda28299bfb03e1c3239b95182579569012 (patch)
treeab2def4dedf7fc9712e3caa3dec20345e0d96eb5 /t/t6427-diff3-conflict-markers.sh
parenthttp tests: don't rely on "hook/post-update.sample" (diff)
downloadtgif-ee32abda28299bfb03e1c3239b95182579569012.tar.xz
tests: assume the hooks are disabled by default
Stop moving the .git/hooks directory out of the way, or creating it during test setup. Instead assume that it will contain harmless *.sample files. That we can assume that is discussed in point #4 of f0d4d398e28 (test-lib: split up and deprecate test_create_repo(), 2021-05-10), those parts of this could and should have been done in that change. Removing the "mkdir -p" here will then validate that our templates are being used, since we'd subsequently fail to create a hook in that directory if it didn't exist. Subsequent commits will have those hooks created by a "test_hook" wrapper, which will then being doing that same validation. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6427-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions