Change .patch file line endings to crlf match the asn files. Add --bi…

…nary flag to patch command to prevent stripping CRs
CDOT-CV · Nov 20, 2024 · 784459a · 784459a
1 parent f62e5fe
commit 784459a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/asn1c_combined/generate-files.sh b/asn1c_combined/generate-files.sh
@@ -27,13 +27,13 @@ fi
 # If 2024, apply .ASN file edits
 if [ "$year" == "2024" ]; then
     echo "Applying J2735 ASN Edits"
-    patch --backup --forward --reject-file="-" \
+    patch --binary --backup --forward --reject-file="-" \
         ./j2735-asn-files/2024/J2945-3-RoadWeatherMessage-2024-rel-v2.1.asn \
         ./j2735-asn-files/2024/asn-edits/RoadWeatherMessage.patch
-    patch --backup --forward --reject-file="-" \
+    patch --binary --backup --forward --reject-file="-" \
         ./j2735-asn-files/2024/J3217-R-RoadUserChargingReportMsg-2024-rel-v1.1.asn \
         ./j2735-asn-files/2024/asn-edits/RoadUserChargingReportMessage.patch
-    patch --backup --forward --reject-file="-" \
+    patch --binary --backup --forward --reject-file="-" \
         ./j2735-asn-files/2024/J3217-TollUsageMsg-2024-rel-v1.1.asn \
         ./j2735-asn-files/2024/asn-edits/TollUsageMessage.patch
 fi

diff --git a/asn1c_combined/j2735-asn-files/2024/asn-edits/.gitattributes b/asn1c_combined/j2735-asn-files/2024/asn-edits/.gitattributes
@@ -1,2 +1,2 @@
 *.patch text
-*.patch eol=lf
+*.patch eol=crlf