From 287a7f0fc2a71b5e4df36e9f1ecf9b05d0212a85 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 3 Aug 2014 18:02:13 +0100 Subject: [PATCH] Test mismatch during push --- tests/tests/push-newpackage | 11 +++++++++++ tests/worktrees/pari-extra_3-1.tar | Bin 71680 -> 92160 bytes 2 files changed, 11 insertions(+) diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage index eea5685a..030507f1 100755 --- a/tests/tests/push-newpackage +++ b/tests/tests/push-newpackage @@ -18,6 +18,17 @@ LANG=C t-dgit push 2>&1 \ | grep 'package appears to be new in this suite' >/dev/null t-dgit build + +git checkout bogus + +set +e +(set -e; t-dgit push --new) +rc=$? +set -e +if [ $rc = 0 ]; then fail "push succeeded when tree mismatch"; fi + +git checkout master + t-dgit push --new t-pushed-good master diff --git a/tests/worktrees/pari-extra_3-1.tar b/tests/worktrees/pari-extra_3-1.tar index 115a79568a669684f99ceebcc6e7b89d419cee05..81a6a54aa4d7bb1b7fd737341d977a6f7e0e5ccb 100644 GIT binary patch delta 4184 zcmcgvdsvM59-p@&LMqwH_01(+WZwJCL@JVU0hOBRN)sP=bRI7|h|YAQ-{u7l>p3s0-jlLTr>PKnN1U z5QIdyEF1fR09^0E~D(W_zJ zg1`g6w)=3MFBK{MI|8k@HRR3VUsI2$_^JNdkG1!OQxVVj87;6<_~`3o?@eRt++S~6 zkUEvJ>QMU#4jx;VRipn$MX!{Yrgqh9|GnN=R`R32*V$nB4-HpTTiV=S>QeaS-m!K^ zL;jQYNVK-!xQTbp_#FQ$lwV=WnVap&&pY^l>{N$`CCOAYS5u3_gir}mEO|LSba2yJQJ`o&7$;rZ8lkH3<%;j2N%(>%8C zuo>un;$rj>z2P3|@blEL>Oha8-4z*|bt>!j2i0C-`2+MTG5x$rd9ne^e{RVi7Pn@` zE>!{8Z!(lzAhw1^R~~w*$+*Z*sZmG3U)o=IJjSlH2#enC1Z2h=a-N^l!@oISxOr8w zAChfLCBZj0{H}Rd67s|QePt7$h`)85tX-BPGN><<`{j>&lq$JtJK-vN(3ng5^&(W~c4WgIR++ z>@!N-j~Ptf5oCAXL0DJaFeW@fvc)2tA}E1C#1+C63=tf$5Eh{v9>f#EVzE$&2{=3w zqZ59r8$xj2a}TELfyF%@0H_Kp!xx`{90HrZOU|ixxx8uo<}se`SxXyYS|rUy9uZrp zmZw9jMk}93Z)P9Aez?EkU$G%B!1wcg97UUICLUN8R9$(%&DZfte*3vaH6DjnwM5v? z(O0-a6SmIG4KDfO@i!H1}1ztvPxTD&%3Ym-9yNK`Q0J% z;EKhocji8_Aq@p+v0JR#A!=n(_N!I<8Wrp6YDC%Y0oEZI1MB(h=W`cCof>&QDuBM% zFhDoc)!7Q8x`(c-s>)pfPl}C^VjhkNDV)MYkU)$HgaR&ta|jVE#xO1n!7wI3Q4?|~ zg1?U(jAIt${<;E)X>j1y^Ro)7c2o;{XWX*=&j0A7g>~9xcaF_IDLsF@D(^Se zmU|2C(&704x*%`VheAJl)fkH_o86!90@ITw(LD-*ThiAFN4}$xd;=v)9_s7O#<|Gag z_$S%vF?l+(%uEB?4ELjEI+H*Sn(_N|8gzyO6Q6cHpBfHsVl`b|K7Kpzg;N4}1^~M1 zoc_#&iW%D}4sp7wZqr)pA#{C(nM#V&11x=p!09oRnUvovU}2pZ1~E4{B}uSUB=rN6 zsHK7gilpCS1zSo9NClh8V`HMd^>-KAma@ob$lyCMX`9Sk<{i-3(A5YzlT0neV2-Pj$S z&Ez65#@)nZg_P!TJfLaGVQ6e#_i(hU**_R)Yd>{%cz9T3+_d1Z$Z-C2wPT3M!) zZ#igM=IDKqA-5I)I);C=8`8G#0GcP6Zgj8i3e@BQYRnZT(5L+XSAL^J$D)4`>+8oF z-z?S}fYtYbUOT2WusdOyHno-8jqu@Z?PZftsxm6$H=5sOwGSJ$!`iz0^1)o~l5T|$ zZ)wZhxX!yA)WgyXEA64m>ENN{s5?8)h#To~_ZFZA-E_}#>>0F8mx{qCy@Z;U>r$W> u(9wIV4KS49La+(xi;hzJ{*7#W(Hn3$L{7#Nxu zm>DrB7(i4=b_#-Z85$VCb!m5UPVO?|WivHKm}Dw0zE~nbWV1w7c7c?Ek+~^@p%Jp7 z#wO+_a6@13Vcae$!syJn>01}i^ez)dK2|exsPWqwnHigyu^C}zYJ|mzNm>Ha1%w!@ z;9f8Wdcnxl5T)_3|DJhFb%WfXDi^`D-DM>b&k9-wSUNRX>5(8(4I zW(tN}-ZM^IYKf5yS-F|V$03IAO6`6^dCb=9ulUCG zZQ2c)a;H<@kL^#CJ|{RudR2p|*57AqcWf5)+QGO@g|Uloa+d=y8#tW6sb)K)G2?%> Q%?e%*7;zGl9dr)>01v6D3IG5A -- 2.30.2