From bd5e59ee72113206e0f0d64853413f7dc41156bf Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Mon, 8 Jun 2015 09:04:39 -0400 Subject: [PATCH] crlf: include utf8 resources in master branch Include the UTF8 and UTF8 BOM tests in the master crlf test branch for completeness. --- tests/checkout/crlf.c | 14 +++++++------- tests/resources/crlf/.gitted/index | Bin 888 -> 1912 bytes .../09/7722be9b67b48dfe3b19396d02fd535300ee46 | Bin 0 -> 344 bytes .../18/c637c5d9aba6eed226ee1840cd1ca2e6c4e4c5 | Bin 0 -> 442 bytes .../23/f4582779e60bfa7f14750ad507399a58876611 | Bin 0 -> 219 bytes .../2a/d3df895f68f4dda6a0a815c620b909bdd27c05 | Bin 0 -> 462 bytes .../2c/03f9f407b576eae80327864bab572e282a33ea | Bin 0 -> 455 bytes .../33/cdead44e1c3ec178e39a4a69085280dbacf01b | Bin 0 -> 221 bytes .../5a/fb6a14a864e30787857dd92af837e8cdd2cb1b | Bin 0 -> 194 bytes .../68/03c385642cebc8103fddd526ef395d75678a7e | Bin 0 -> 190 bytes .../77/afe26d93c49279ca90604c125496920753fede | Bin 0 -> 178 bytes .../bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 | Bin 0 -> 170 bytes .../cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 | Bin 0 -> 565 bytes .../e5/062da7d7802cf492975eda580f09ac4876bd88 | Bin 0 -> 181 bytes .../f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 | Bin 0 -> 561 bytes .../fe/ab3713c4659bb22700042b3c55b8d60d0a952b | Bin 0 -> 568 bytes tests/resources/crlf/.gitted/refs/heads/master | Bin 41 -> 41 bytes tests/resources/crlf/.gitted/refs/heads/utf8 | Bin 41 -> 0 bytes 18 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 tests/resources/crlf/.gitted/objects/09/7722be9b67b48dfe3b19396d02fd535300ee46 create mode 100644 tests/resources/crlf/.gitted/objects/18/c637c5d9aba6eed226ee1840cd1ca2e6c4e4c5 create mode 100644 tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 create mode 100644 tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 create mode 100644 tests/resources/crlf/.gitted/objects/2c/03f9f407b576eae80327864bab572e282a33ea create mode 100644 tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b create mode 100644 tests/resources/crlf/.gitted/objects/5a/fb6a14a864e30787857dd92af837e8cdd2cb1b create mode 100644 tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e create mode 100644 tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede create mode 100644 tests/resources/crlf/.gitted/objects/bb/29a7b46b5d4ba3ea17b238ae561b81d59dc818 create mode 100644 tests/resources/crlf/.gitted/objects/cd/d3dacc5c0501d5ea57bbdf90e3d80176606139 create mode 100644 tests/resources/crlf/.gitted/objects/e5/062da7d7802cf492975eda580f09ac4876bd88 create mode 100644 tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 create mode 100644 tests/resources/crlf/.gitted/objects/fe/ab3713c4659bb22700042b3c55b8d60d0a952b delete mode 100644 tests/resources/crlf/.gitted/refs/heads/utf8 diff --git a/tests/checkout/crlf.c b/tests/checkout/crlf.c index 61459b3a4..2db5835b5 100644 --- a/tests/checkout/crlf.c +++ b/tests/checkout/crlf.c @@ -115,22 +115,22 @@ void test_checkout_crlf__detect_crlf_autocrlf_true_utf8(void) cl_repo_set_bool(g_repo, "core.autocrlf", true); - git_repository_set_head(g_repo, "refs/heads/utf8"); + git_repository_set_head(g_repo, "refs/heads/master"); git_checkout_head(g_repo, &opts); if (GIT_EOL_NATIVE == GIT_EOL_LF) { - check_file_contents("./crlf/few-utf8-chars-lf.txt", FEW_UTF8_LF_RAW); - check_file_contents("./crlf/many-utf8-chars-lf.txt", MANY_UTF8_LF_RAW); + check_file_contents("./crlf/few-utf8-chars-lf", FEW_UTF8_LF_RAW); + check_file_contents("./crlf/many-utf8-chars-lf", MANY_UTF8_LF_RAW); } else { - check_file_contents("./crlf/few-utf8-chars-lf.txt", FEW_UTF8_CRLF_RAW); - check_file_contents("./crlf/many-utf8-chars-lf.txt", MANY_UTF8_CRLF_RAW); + check_file_contents("./crlf/few-utf8-chars-lf", FEW_UTF8_CRLF_RAW); + check_file_contents("./crlf/many-utf8-chars-lf", MANY_UTF8_CRLF_RAW); } - check_file_contents("./crlf/few-utf8-chars-crlf.txt", FEW_UTF8_CRLF_RAW); - check_file_contents("./crlf/many-utf8-chars-crlf.txt", MANY_UTF8_CRLF_RAW); + check_file_contents("./crlf/few-utf8-chars-crlf", FEW_UTF8_CRLF_RAW); + check_file_contents("./crlf/many-utf8-chars-crlf", MANY_UTF8_CRLF_RAW); } void test_checkout_crlf__autocrlf_true_index_size_is_filtered_size(void) diff --git a/tests/resources/crlf/.gitted/index b/tests/resources/crlf/.gitted/index index fb2f7db2f77fbcd9c8a7a1dd1ecd8acb77308cea..e8d43e97e186e58a7a475c583080f3753e8862b6 100644 GIT binary patch literal 1912 zcmZ?q402{*U|<4b;n32Jdw?_pj0UkGpm7O|1*9cbE_yN1Ms}Zu(66J%isZfQxH zMN)n)!aW4sB~m%P;Ntl&>A_2Dw=YN&ogF4{E6<974P+k3RS5UM+=s(m;x*^epEedh z+8|%MQRUpKeTK~!=Xf&kLCit8ifDI9w3@Joo`3qNN5iy2vSPQ)o0rnI{0#g_nR$st zmAWwRg55_{_=~L1KcBmB+BebbXBTB|jgIje;yxh!+)D&O<0^=4IUNG}uG)$a<0VRG#SAA$+c{=#k;k3Eu z7d+`yjNnb0cbq{S(_Cn>0lD`e$SfF*-CV}!e5@KBOVxzI!aGz4fKG5K2fqFmiK>*cp)H*efI=l1%eRjr;smN0N*CIBMM6LBnW z`(wKKxYSa&$3Nq?-m>Xk+vCU}fMg!LydcVb()?eS+Dq=gwDsM>U7<`h{r}(`lIn`;}uj&qdjq!OTsKdYy zH3#l0qT`d{+1y97H(k8u?A@)ot~~0-p(j1T6B#(GQj79+lPXJ68A5_wU4d?qVlcE+ zFyQ*M-SzsHT0t+XY{TW-G@i*d_)0|txrPF32Sz)zJOC=@^-3yA7z_;z%uGxe3}6gw zITM>0nt3=(!}8;HYw*zzGZv5b42>NBi2ak;fhd@KmpVZ4#` GmlFVw-yjhH delta 345 zcmeyt_k+#A#WTp6fq{Vuh`B@gzA6D}1{lrAz`(-$xalSXL*o(#2F9;IDUpc=s_NL4 z-9lCdRLVc`j3Rg8+9t4xKzd?=^yFklEfk>*GLyG3YN89VFc~5XO?F`N1@h~l2Gvde z!0d{`cVKZ<#_p!u$Zndvf<+aFx;rT999VIwyNjak2CIrlUGUudKi#a4`}zo;c(_)T JJ^PSBI{+r0Sl$2t diff --git a/tests/resources/crlf/.gitted/objects/09/7722be9b67b48dfe3b19396d02fd535300ee46 b/tests/resources/crlf/.gitted/objects/09/7722be9b67b48dfe3b19396d02fd535300ee46 new file mode 100644 index 0000000000000000000000000000000000000000..5c5c24cd54e0155b5796ec770bb5110803ae369b GIT binary patch literal 344 zcmV-e0jK_W0V^p=O;s>4GiER}FfcPQQAo_m(M>MONz*MYNwZ+!TAt_bt2+DoLA&j0 z3oUajWVgn2ASr|?t2vkcw6XZn2Km~JD(6=1Gi<&%#}le7DKjszs8SbZEJLdad+7P6 zk9ssrDr-}x;|H=`=d&8$dG(FM98 zxrjl*H1ueCZt2;EYqJCPZTzyeJEO5@p&Yu q165a*T9mJwR9TYB@NDj**_$q2bN24mTvr}-6Fl8__FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqG&Q=VC21B6T+8#^eN|^)KWMjIZJ}k3h3wXt4kU#@qbjEtTs;3JJ$PyD_62F8 zv%>^#+{d&E}ZsF^!nLFnOmb{{LXJ#x*1hrZe~Slif&FC(ANwK zrlCjEb4$-QT$>%RZ{wG(9Y^Q9#;F<-OshULuRI-m>u}oK^9!DIDn{@o%{va&f^70d zxw>!G%WunW-netl?e#~iT0MU(!Bhq@(y_elkLl*)QcK+)|BTyu%cgg2k0VTNeo-n! z5&zev_LBQAZGE?JS18leBc-D0o$cs~Ai?^Inb#)gjiN&4n`JXj?OM7elwVX3StT%( zSne@wj`(QYIi)?USTW+&s`m?BdQg=>jJnhDc>iCOOq<+OO&kevR>YB&Y*bSCv|n kubWg^lFIOG?xWe8E?#r??$%sa9(Ci;lb+y-05wtiqQal$0RR91 literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 b/tests/resources/crlf/.gitted/objects/23/f4582779e60bfa7f14750ad507399a58876611 new file mode 100644 index 0000000000000000000000000000000000000000..4a4e4dc9e6538d5a2b15feef79c8c1e4cfc1668d GIT binary patch literal 219 zcmV<103`o-0Zoq0PQx$|ggNIa_KsSu|6{2_CS z!J|bTg*4h*FVPt_FmV@dEtLu%dHTNPABMyAk&gF}O4-LU?$hN3gce#Up@e~F>=C;a ztPdMkc%vm$f>SEvTqZd1YTVM1|G=YdrcI-ik;WMfJJhSDdnJM)UwMWlw*+ID?(lhf V-}Mkvs569V<-Gjgx?k|gSZ$FwZKwbM literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 b/tests/resources/crlf/.gitted/objects/2a/d3df895f68f4dda6a0a815c620b909bdd27c05 new file mode 100644 index 0000000000000000000000000000000000000000..f5421cf6a0d6e21d8dbdcfa292999ae7ac44ea7d GIT binary patch literal 462 zcmV;<0Wtn~0V^p=O;s>6F=a3`FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`5AGV>CPDs|z8wVJSpo`3qNN5iy2 zvSPQ)o0rnI{Fq9CX0FdapSy6{H__{77iDgZj`2IcW$9*Ag}Ip(sVTZSX+T#pD42#G zP0uYo+i-1mz`l)Nwssty^BSjWh__aKXkK|b_}1aHx#t%==~Rs1O`3NcswFM8T(`6& z%|bUhBeAF$tX!|8qJ)8uRimS+YpTz}x`?LaKAS8KyV3*LwdACMHGH`gU76cvQN+5` zv$6DA-o%Sf8M2@nauf3^v08FA+&@Ztl}}}We~0;YgJ0Z&_x{bqp$BTqtQ=G0e;;S< z&3n_AsE{2KI77SPCQJuX7+sXB`)0lTw(RDOJLlY9f3&LA^T!fQWstyeEN}Z`y7{=& zQn$xH0R672veJ1lnPPA|8=Ro>n2r}q%u64`)Ky2i`SgJyEWI9N8LE|q$hYH0Fwd; Eqk5(BVgLXD literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/2c/03f9f407b576eae80327864bab572e282a33ea b/tests/resources/crlf/.gitted/objects/2c/03f9f407b576eae80327864bab572e282a33ea new file mode 100644 index 0000000000000000000000000000000000000000..0e4afbbba615e8c04237de193d5145c5535723dc GIT binary patch literal 455 zcmV;&0XY760V^p=O;s>6vSctcFfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqBsD-4mD39@p8t{_ytH=vf;7?DVFI`Ete`5AGV>CPDs|z8wVJSpo`3qNN5iy2 zvSPQ)o0rnI{Fq9CX0FdapSy6{H__{77iDgZj`2IcW$9*Ag}Ip(sVTZSX+T#pD42#G zP0uYo+i-1mz`l)Nwssty^BSjWh__aKXkK|b_}1aHx#t%==~Rs1O`3NcswFM8T(`6& z%|bUhBeAF$qMVOaqob*7s?Wl@h^FK|n=B5y(gWC)10Db6Qgmf*n?(`pQqRWHYk3nd zK4r*)D$Y&JtHdz;Y`A}v_9~ys0RIm2?FPTN1@HZvi9o zCUAy!!%diKq%gTCSNF|&`EA+F8+XpRz5ZxbtLKj;n93l&b1ZNBW4igc)Ka&{KjXIE zvguvh;|NomUz7?_#Q$}vz2yE&Ti-3*70NXANU3OgXFIYYpwn3HF>H?bXxuraJ*-$U x;?=763tf7kN~%(e@^zCcOHvu0&3!a`)5UAf-rbt(%A;-^deRd-5dgx#0&PLZ?N$H) literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b b/tests/resources/crlf/.gitted/objects/33/cdead44e1c3ec178e39a4a69085280dbacf01b new file mode 100644 index 0000000000000000000000000000000000000000..72dc780a06a277add6ad40c64246e094d45eb5c1 GIT binary patch literal 221 zcmV<303!c*0ZooOZo@DTL{sY&+XpuI(eeWrfm0+^O6LIUB?$_)#Dt7N1&;5flX-lJl61OMM7rNRX4rMv1c*{v3j`EU^2c8m9(^(RqtD86seTW0<~g!%u|6^^uNu%BAeNjQf0f0olu5YpEr|vv5Lm zD_9@4Sm7-!R0EuH8Rs&=A+E+P9pfK(w9T|>v_^&A7}$w^)pV~RKpL)bhGl3OMw;&M Xd3xVD;7oM}npPf{|6BJ9E1y`>DBos_ literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/5a/fb6a14a864e30787857dd92af837e8cdd2cb1b b/tests/resources/crlf/.gitted/objects/5a/fb6a14a864e30787857dd92af837e8cdd2cb1b new file mode 100644 index 0000000000000000000000000000000000000000..11a25c581cb696cae72507e4997f70ee9eea7cb5 GIT binary patch literal 194 zcmV;z06qVB0ez1_Y6Kw=MYHx4b%7*mY3YOzLLkeK&0N6Nl4%&npf-K|IAI{W+5LJ2 zkN;yWWgVbNK8(f;Suf7myHaR2}S literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e b/tests/resources/crlf/.gitted/objects/68/03c385642cebc8103fddd526ef395d75678a7e new file mode 100644 index 0000000000000000000000000000000000000000..f8d489fcb68ed73379d593157bde9196b8b439f2 GIT binary patch literal 190 zcmV;v073tF0j17MYQ!)Q1kkK?ioU=EeJr&MA!HWG2_^?s_QUCw| literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede b/tests/resources/crlf/.gitted/objects/77/afe26d93c49279ca90604c125496920753fede new file mode 100644 index 0000000000000000000000000000000000000000..a377cb04d0ce55637b35067787115e38bce08718 GIT binary patch literal 178 zcmV;j08RgR0i}*h3IZ_@L|x|;eE~JUPBJ1Qf=hAZ1!AWM1!H6;GS@dF-oQ;!^$Loj zlJmWSc6Lz*W>A5g@r0?1*XWp&)=gEgl9HmR*^y;SC|+^kX9Y(XI*-107&|YcBa)uH zBGa3sQMWmz=t?5K>#YoMOj8^ZTy7^)$>V_L|fy8kHi{D>;QgQu8fV%B+o;0JU z`?h^eA2B@5!^}ewiLqH}EG^|e3|lBzxI-MBkPyHuvAfj6&eO9}EUA@lF{qXPorykwE+M?}yKcDP(_@@`$w>KYMONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqG&Q=VC21B6T+8#^eN|^)KWMjIZJ}k3h3wXt4kU#@qbjEtTs;3JJ$PyD_62F8 zv%>^#+{d&E}ZsF^!nLFnOmb{{LXJ#x*1hrZe~Slif&FC(ANwK zrlCjEb4$-QT$>%RZ{wG(9Y^Q9#;F<-OshULuRI-m>u}oK^9!DIDn{@o%{va&l9pNy z_Ly#RMq*JhSh-$FMF|5Rt42pt*HoW{brDU;eKuJfcBKcfYspCiYxr_0x-z%TqKI{= zXJhHLyonc|GGswDN`Sl;%>bn|hk zrEZUZ#%;Z2)4R6E5vDf3C>5fJ|LanF$^DnMzFW8}lxgabQqlCzc63FM1oDcR*CywU zqC)1IWiw9gTDm2aUsMoTB{05O?lEkR_-NcYr9G@zG2+##_X}NmP?bQ8y3_G^r}(`l zIn`;}uj&qdjq!OTr~_43m0Faqn^akn%J6LNquHA-UUT;D)?8N}b>q;Jp5Tc9=fg(b DK&m1x literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/e5/062da7d7802cf492975eda580f09ac4876bd88 b/tests/resources/crlf/.gitted/objects/e5/062da7d7802cf492975eda580f09ac4876bd88 new file mode 100644 index 0000000000000000000000000000000000000000..62835b9e1f6a84a4a6b7d1cf9d8dfec6465ebf23 GIT binary patch literal 181 zcmV;m080OO0i};oiUKhZME%Yw`T}Yvon$g1iwOHE{&;~-(!&VGEHe?W@3?pa|EgX= zQI%>b*9OMhRhvX$5RTMoO4hqRMq@fev?fw=E{5zeBlpfk^~aOk8xW-|oUIj|NRsY? zP|ucqkHMLMIdU3MN5zje)(L*|lcx-qv6i{sVJ{1PtAqRpAGb-h{D8JZ&UhpTYqW@J jq087NU)HEc8^R9eT9&`po6PXs!kfYIe45n@$GBDN<62qx literal 0 HcmV?d00001 diff --git a/tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 b/tests/resources/crlf/.gitted/objects/f2/b745d7f47d114a3a6b31a7b628e61e804d1a58 new file mode 100644 index 0000000000000000000000000000000000000000..7b2e7a11617389b0edb33ff0462df36752badf05 GIT binary patch literal 561 zcmV-10?z$-0V^p=O;xZkFlI0`FfcPQQAo_m(M>MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqG&Q=VC21B(`MC^S%k$iQRcBv6Xt!N$p=FMR?ADkLB(*@(DyJ7*JpUySS)r(an^kiz{b^(IqYd)48&%G&+Gp5&agHZcWm0BdVo{|o+=;Cw?4jqM zKI+jht&ptPE%WB3v@JiTQlRbY^Uvoloc2xh`q@R9TcczA&Tm<|8C79!W<_d>ZcZA| z?+gm2p-0nmOV2i3n;o!kn{IMOVo@bn|hkrEZUZ z#%;Z2)4R6E5vDf3C>5fJ|LanF$^DnMzFW8}lxgabQqlCzc63GXH1Ud=*CywUqC)1I zWiw9gTDm2aUsMoTG0-0@_ZT)ud^GNy(jHc<81ZV=`-Lt&s7m0b-RXF|Q~X|&oa!{~ zS9J%!#`ruE)PX9kN-fIQO{y$OWq3CC(d}M$0V^p=O;xZkv}7MONn=>K=*2`E*?k&9zm7iJ@?go{ zSl-AqG&Q=VC21B(`MC^S%k$iQRcBv6Xt!N$p=FMR?ADkLB(*@(DyJ7*JpUySS)r(an^kiz{b^(IqYd)48&%G&+Gp5&agHZcWm0BdVo{|o+=;Cw?4jqM zKI+jht&ptPE%WB3v@JiTQlRbY^Uvoloc2xh`q@R9TcczA&Tm<|8C79!W<_d>ZcZA| z?+gm2p-0nmOV2i3n;o!kn{IMOVo@oi_;M+_GPlj5 zh;^xFW9hZLi5H(TWI;9LCgxRQwd8ELf0XtrpUMFL4)g5>zqkeO{hNtH57d@fIi|+{ zKF->k_ogpVAv-2;hIYeEm=2^cx+quo&3gH5+07ew&bht*XjQA{k0qGOAc5mp-uB0I z^Kq%AZjXP)ZM|jFySB#>rZ&GQ6{3j$>r#8k{g<}BTevHfY3h+u(e%!CbVcwq@`{<) zCg+W!Lgt%gGfwSVx+RofR1jG)Fv?l(F>H?bXxuraJ*-$U;?=763tf6pmB3BA)A4wx z_`N1M)oI$V>JEO5@p&Yu165j;T9mJwR9TYB@NDj**_$q2bN24mTvr}-s(^x2R93Zm)2;OOQS}X~eyfYmRb@J|L9DgWsSFRi%?k@{y literal 41 ucmV~$$qfK72m`Qxr{NF;#-XX$e}vk}s77EjrXiE0fKdASv#?^S^74G)@Cwxc diff --git a/tests/resources/crlf/.gitted/refs/heads/utf8 b/tests/resources/crlf/.gitted/refs/heads/utf8 deleted file mode 100644 index 30ab61cd33ff74df6c7004c62c9acae35eba5800..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 41 ucmV~$$pHW$2m`Rc({Q!wIEb?U2qtMB0bH8x*}A|AigQsRh23=|v)}m8XbNrs