From f913c0b6ed712ab1821e9e05eb61f145df96229f Mon Sep 17 00:00:00 2001 From: Pablo Hernandez-Cerdan Date: Fri, 25 Jun 2021 16:27:48 +0200 Subject: [PATCH] ENH: Increase hook-max-size for next GDCM update Also, fix existing typos: `hook-max-size` to `hooks-max-size`. The singular has no effect. For the after-merge commit ghostflow errors (second and third), we modify the top `.gitattributes` For the import commit ghostflow error (first), we modify `.gitattributes` from the UpdateFromUpstream `extract_source`. See the conversation associated to this PR for more details. ``` commit b creates blob x at Source/DataDictionary/gdcmDefaultDicts.cxx with size 1194766 bytes (1166.76 KiB) which is greater than the maximum size 1048576 bytes (1024.00 KiB). If the file is intended to be committed, set the hooks-max-size attribute on its path. commit a creates blob x at Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/gdcmDefaultDicts.cxx with size 1194766 bytes (1166.76 KiB) which is greater than the maximum size 300000 bytes (292.97 KiB). If the file is intended to be committed, set the hooks-max-size attribute on its path. commit a creates blob x at Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/gdcmDefaultDicts.cxx with size 1194766 bytes (1166.76 KiB) which is greater than the maximum size 300000 bytes (292.97 KiB). If the file is intended to be committed, set the hooks-max-size attribute on its path. Please rewrite commits to fix the errors listed above (adding fixup commits will not resolve the errors) and force-push the branch again to update the merge request. ``` --- .gitattributes | 18 ++++++++++-------- Modules/ThirdParty/GDCM/UpdateFromUpstream.sh | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index f4625eb57d8..05f4774b372 100644 --- a/.gitattributes +++ b/.gitattributes @@ -52,13 +52,15 @@ Modules/Filtering/Denoising/include/itkPatchBasedDenoisingImageFilter.hxx hooks- Documentation/ReleaseNotes/* hooks-max-size=300000 Utilities/Doxygen/doxygen.config.in hooks-max-size=150000 -Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx hook-max-size=1021501 -Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/j2k.c hook-max-size=654063 -Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Part3.xml hook-max-size=4336000 -Source/InformationObjectDefinition/Part3.xml hook-max-size=4336000 +Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/gdcmPrivateDefaultDicts.cxx hooks-max-size=1021501 +Modules/ThirdParty/GDCM/src/gdcm/Source/DataDictionary/gdcmDefaultDicts.cxx hooks-max-size=1200000 +Source/DataDictionary/gdcmDefaultDicts.cxx hooks-max-size=1200000 +Modules/ThirdParty/GDCM/src/gdcm/Utilities/gdcmopenjpeg/src/lib/openjp2/j2k.c hooks-max-size=654063 +Modules/ThirdParty/GDCM/src/gdcm/Source/InformationObjectDefinition/Part3.xml hooks-max-size=4336000 +Source/InformationObjectDefinition/Part3.xml hooks-max-size=4336000 # Avoid ghostflow-check-master failures -Modules/ThirdParty/HDF5/src/itkhdf5/src/H5C.c hook-max-size=400000 -Modules/ThirdParty/HDF5/src/itkhdf5/src/H5Dchunk.c hook-max-size=400000 -Modules/ThirdParty/HDF5/src/itkhdf5/src/H5Shyper.c hook-max-size=500000 -Modules/ThirdParty/HDF5/src/itkhdf5/src/H5Tconv.c hook-max-size=500000 +Modules/ThirdParty/HDF5/src/itkhdf5/src/H5C.c hooks-max-size=400000 +Modules/ThirdParty/HDF5/src/itkhdf5/src/H5Dchunk.c hooks-max-size=400000 +Modules/ThirdParty/HDF5/src/itkhdf5/src/H5Shyper.c hooks-max-size=500000 +Modules/ThirdParty/HDF5/src/itkhdf5/src/H5Tconv.c hooks-max-size=500000 diff --git a/Modules/ThirdParty/GDCM/UpdateFromUpstream.sh b/Modules/ThirdParty/GDCM/UpdateFromUpstream.sh index b4991831ab5..9de74398728 100755 --- a/Modules/ThirdParty/GDCM/UpdateFromUpstream.sh +++ b/Modules/ThirdParty/GDCM/UpdateFromUpstream.sh @@ -41,6 +41,7 @@ extract_source () { git_archive pushd "${extractdir}/${name}-reduced" echo "* -whitespace" > .gitattributes + echo "Source/DataDictionary/gdcmDefaultDicts.cxx hooks-max-size=1200000" >> .gitattributes popd }