From 8678588e6a0b3daa3136ff26bcfb2da309731429 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 30 Jan 2025 17:43:38 -0400 Subject: [PATCH] Revert "try truncateFilePath on windows again" This reverts commit 0d4abbcb92ff40e90cbc44f3d1a42243bdbae2ba. Test suite was failing again with that. --- Annex/ReplaceFile.hs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Annex/ReplaceFile.hs b/Annex/ReplaceFile.hs index 5cb46b17dd..3af555d39d 100644 --- a/Annex/ReplaceFile.hs +++ b/Annex/ReplaceFile.hs @@ -5,6 +5,8 @@ - Licensed under the GNU AGPL version 3 or higher. -} +{-# LANGUAGE CPP #-} + module Annex.ReplaceFile ( replaceGitAnnexDirFile, replaceGitDirFile, @@ -57,7 +59,11 @@ replaceFile createdirectory file action = replaceFile' createdirectory file (con replaceFile' :: (RawFilePath -> Annex ()) -> RawFilePath -> (a -> Bool) -> (RawFilePath -> Annex a) -> Annex a replaceFile' createdirectory file checkres action = withOtherTmp $ \othertmpdir -> do +#ifndef mingw32_HOST_OS let basetmp = relatedTemplate' (P.takeFileName file) +#else + let basetmp = toRawFilePath "t" +#endif withTmpDirIn (fromRawFilePath othertmpdir) (toOsPath basetmp) $ \tmpdir -> do let tmpfile = toRawFilePath tmpdir P. basetmp r <- action tmpfile