From 7b61e55529f258cb12fc6deeb4c3d185d686a93e Mon Sep 17 00:00:00 2001 From: Linus Rath <139418639+rathlinus@users.noreply.github.com> Date: Wed, 30 Sep 2026 19:34:37 +0200 Subject: [PATCH] chore: write nul separators as \0 so git diffs these files as text Three files carried a literal NUL byte inside a string: the admin check's cache key in `app/api/admin/auth/route.ts`, the global search hit key in `lib/global-search/types.ts` and two TNEF fixtures in `lib/__tests__/tnef.test.ts`. Git treats any file containing a NUL as binary, so it showed no diffs for them, never normalised their line endings, and reported every pull request that touched the admin route as a conflict even when a text merge was clean. The escape produces the same string at runtime. The admin route was stored with CRLF while git saw it as binary; it is now stored with LF like the rest of the tree, so its diff covers the whole file (the only content change is on line 70). --- app/api/admin/auth/route.ts | Bin 11846 -> 11571 bytes lib/__tests__/tnef.test.ts | Bin 5135 -> 5137 bytes lib/global-search/types.ts | Bin 5416 -> 5418 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/api/admin/auth/route.ts b/app/api/admin/auth/route.ts index f604e56e5f1c2d1817838ccf400785ec1b1b52e5..baaf584b8fdbe8ea2c248400ff2abc65c251f5c4 100644 GIT binary patch delta 1712 zcmah}YiL_#7^asr%}LtymR@rGay`k(X_Izc>lW?OZoQ;UW9iBiDbBOx)Sfk$E=et; zOMeKmX&qW0LGXtR_D^syhd+eD<{v>E^YTN4vB{7Pe<&#anPV`&?<7maxq0Al_`dh{ zywCf*=gZ|wFTMNB?mqAC(e2$^Z$YWshx2s<_`Z(E{klm+>z_rbKC9ulkRagC`U#9Q z%;EKh7_K$M8aN`r+?asU7{jH;_t=A1zCO-Fv(Ixee844emz%?o zK890zAI|F+spX!26k&rE^M*J+G|b|TVJ|E#EM}r5f!&sQ{L~VM*gA{N))8E2Jpzr9 zH!g=gTgkkfnvn{trB@<|7{f>#Cur0~;|P8+N+yaYFBdoRS)vriQyC>2Vd##v`S51j z6!ja_nQDFh-u40uU{6LauI5tv2|qo##EW>jeT2Eu<^mCX)NaP*P60o+FIg(?l^QEj zx*#(S7z;SkF^DrAVQu*w!51Bq&~`>K)4ANO-YF}@@060s+(xz-O9d#?mpfOUnsU4= zhMlfi{LnQFy(z|5%2&}YJb#$Nt=z84QcBJj_S3xErXW5xiMooVB;vNohKHtuIM^K% z9^D4Yk+erD75b?7j%TFxMY%ALTPp(;aHl)*RFI23L2UQTR{Q?0rymb{#xT~q;8*kh zdm>C)NvW7zC4M=d&*fR6&wF#We>zvGW%5#&VXlufGDYJ=-=5kG2gLv+r+_!aJxywS z30Flgl4hPx`>c5uKbm83S;in)d^lqn#Z`+9w=6j%tf%y90Gk~lSoa-*)n=!*2_)>z z)Gp#vn_#H=FsEy-08M+_;>4)kLF>A3(r&0U&fy(<5WjgHxM8=cnB0z0hZ;^hVEl$c zWKk;0B&}qWB1x{w$u*Q5KC^06$yY4{bmwxLvMP`(jst2z7hJ?olM6{Mg8g%ZZZc9~6SDd4rwfwJ1X@%uwJ&4+pNR)Ld@B^+voNz5vW4?9?b~Q%Y zlqk@R^%O-NmkPyr?o}o0rzH`!ISjl=wkjz&{NW~yi!K`X_;9!StvKgipiYMw=hcxe zc?Q&<)@jcau6yQT_0HqCcf362i{7Eym>I1tz94OI$1;qZZxWyR*xujwEn=Pz(U#pf z$G?cb_@Q|u6bZpM0c&~j>9}x#?^Z8$ zf)}=cr79QN_Y(@e9dObn9k?E_;n#o#&4Q1DB!OPU1Q*i6P+16+H9CR^e8{R|EhGIe v+WOEQTzZVQuY&GJo6rNDXs^-qgl)JhdMS*k%?6>r_5VhdVfC06*qHtXtnTI} delta 2167 zcmah~T})eL7`8z9DLv3ae<+mpYfFF5p-`N_5M&C= z@9*>e^vWyOj%^HCxDSS+0I$6XaO;ePqmt!mz)edp;1`xS;BS@*z@e&V0QD-Rp0jbb zlpt{QPSrSE@zn?Lp*jutS#{dV*$BKf)Xc*9Xbs+8sF?x0S2GPbXnhuN#rgu^r`Cum z{k?S(&avA4fQ8z0E!s$dKrO^ZZ`WcJ*1AkJc&10{Bsg8IO9I}hn}t{i(Ti(joui}m z6AnC<$h@qGg#x?WsP{FpOU_n8{mb=BpxM!YAuTja0bXMGM?)90@3&#dk`2SZV#Cz_ zVmFhGG5EdQILD;68}|m#syt5;pw5ODDkM?@fL15^El3A;`@r zz11xGFc8zZtc~TDWo5)n*6qNcM;yrOX@{qhtS!e;FDl|^S<)BP{4j}6P8^OWIojwP zOc-w^9!#MKOH`9IO;(jTN$XXYc%U4f=;z)jecy>O|KM~n4^RPQddK-BT=ul|HJG*_ zg?tP4(#4kN0Do#Z)=^YsC^pUC5d0>IeMDmEL2Rsz@et z@DOHW=C~+{d8w!k8&P9Qg!-M~DoA&qJIR;DO1lat)%@BpnLc!IwpY`Ova%r0uO*<% zHr&sH$FJS#UHVGAsl?dgXv*WQL3@lE#ghT?2dKH}>4wW1?{ozbXUdkcvgMi1g5*HnrOb`Tnj$X`}XRL}82w(m-zro_bjU4IHbV1uy-( z&0pCKLN^Z%vjKsYx}SmxM|w&y8a^DrZ+vmqaXUU_e1AK#f3_Xtyxtx&GCdK+G6)@= zfLs1?`d&wm@vs>SQ`J{Tf9%MZy}=9*`*Gk;`vXjV`hHn=r(iciVA*hVsuQO@6AaVy zok94O4TR}T(q7qYcRP_$cOV!vG+Doz(=efkCks+O!87Wz0Wnfe(6o?BkvUP9NI_nf zb&^|@a!VZjG7$4u*kW(JuvOGmiM1$o262^Tg195H0Rnh6h<*KMaB8p|etCRwAQ-7R zRnc^^PELuMwyGBMP~1_1tp;<(QH|i9z%qPAgv#`)Lwj8n!Mq_BWFv@7FhbRk6SUq6 z;kbPq%CL23FlVC&I(d^3aaDxmR!-$1(-~3IXVe8*NkD+-k^#CL=AZ_gjb4Zak=jS~ zT_NeG--a_)Op>t5ZV27R)~)C}`fjAxT>ZE diff --git a/lib/__tests__/tnef.test.ts b/lib/__tests__/tnef.test.ts index 67cfc7f7ab5f5c6ad9e5f8daff612407cd2efa0e..6eef50958ad210e0da88435e4458da8237b739f3 100644 GIT binary patch delta 33 pcmeCzn5eNKfQu={U~?c>0wYU|fx7181Od^>R@|bS?{OP)005&|2{Hfx delta 25 hcmbQJ(XX)~fQyk~@-Ggv%^h4?jEoGMw{XXD003$#2af;% diff --git a/lib/global-search/types.ts b/lib/global-search/types.ts index e1e89701b41768b884bd24ec72e1b078700a7e65..0f2367a357e1382d82717404fa88916db7d4381c 100644 GIT binary patch delta 47 wcmZ3XwMuIPv#5HEfl75oW{F--esW@tV{&qSX