summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-01-24 08:27:49 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-25 12:32:32 -0800
commitc20d4d702f13e6bd4e4c8757989bed62a75e2cfa (patch)
treef03fd31ea3b690eadf21e768f8c98481d4c22875 /mergetools/kdiff3
parentfsck: check HAS_OBJ more consistently (diff)
downloadtgif-c20d4d702f13e6bd4e4c8757989bed62a75e2cfa.tar.xz
t1450: use "mv -f" within loose object directory
The loose objects are created with mode 0444. That doesn't prevent them being overwritten by rename(), but some versions of "mv" will be extra careful and prompt the user, even without "-i". Reportedly macOS does this, at least in the Travis builds. The prompt reads from /dev/null, defaulting to "no", and the object isn't moved. Then to make matters even more interesting, it still returns "0" and the rest of the test proceeds, but with a broken setup. We can work around it by using "mv -f" to override the prompt. This should work as it's already used in t5504 for the same purpose. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions