[git help] Cloning the boost git repository recursively seems to have issues.

On Wed, Oct 30, 2013 at 11:16 PM,
Date: Wed, 30 Oct 2013 23:31:25 +0100 From: Daniel Pfeifer
To: Boost Developers List Cc: Mike Subject: [boost] [git help] Cloning the boost git repository recursively seems to have issues. Message-ID: Content-Type: text/plain; charset=UTF-8 Hi Mike,
Thanks for reporting that issue. Migration if Boost to modularized Git has been decoupled from Ryppl. I forward your message to the Boost Developers List.
-- Daniel
---------- Forwarded message ---------- From: Mike
Date: 2013/10/29 Subject: [ryppl-dev] Cloning the boost git repository recursively seems to have issues. To: ryppl-dev@googlegroups.com I ran the following git command to retrieve the latest modularized boost code in github.com/boostorg:
$ git clone --recursive https://github.com/boostorg/boost
The boost repository and all its submodules were recursively cloned as expected, but bootstrap.bat in the boost repository and some library submodules were marked as modified. Not what I expected. I ran the following command to get a list of the modified files in the submodules: $ git submodule foreach --recursive 'git status --short'
I got the following output: Entering 'libs/accumulators' Entering 'libs/algorithm' Entering 'libs/any' ... Entering 'libs/geometry' M example/ml02_distance_strategy.cpp Entering 'libs/gil' ... Entering 'libs/interprocess' M proj/vc7ide/doc_managed_grow.vcproj M proj/vc7ide/managed_shared_memory.vcproj M proj/vc7ide/offset_ptr_test.vcproj Entering 'libs/intrusive' M proj/vc7ide/avl_multiset/avl_multiset.vcproj M proj/vc7ide/avl_set/avl_set.vcproj M proj/vc7ide/sg_multiset/sg_multiset.vcproj M proj/vc7ide/sg_set/sg_set.vcproj M proj/vc7ide/splay_multiset/splay_multiset.vcproj M proj/vc7ide/splay_set/splay_set.vcproj Entering 'libs/io' ... Entering 'libs/math' M doc/equations/gamm1.svg M doc/equations/gamm2.svg M doc/equations/gamm3.svg M doc/equations/gamm4.svg M doc/equations/gamm5.svg M doc/equations/gamma_dist_ref1.svg M doc/equations/gamma_dist_ref2.svg M doc/equations/gamma_ratio0.svg M doc/equations/gamma_ratio1.svg M doc/equations/hankel1.svg M doc/equations/hankel2.svg M doc/equations/hankel3.svg M doc/equations/hankel4.svg M doc/equations/hankel5.svg M doc/equations/hazard.svg M doc/equations/hermite_0.svg M doc/equations/hermite_1.svg M doc/equations/hypergeometric1.svg M doc/equations/hypergeometric2.svg M doc/equations/hypergeometric3.svg M doc/equations/hypergeometric4.svg M doc/equations/hypergeometric5.svg M doc/equations/hypergeometric6.svg M doc/equations/hypot.svg M doc/equations/hypot2.svg M doc/equations/ibeta1.svg M doc/equations/ibeta10.svg M doc/equations/ibeta11.svg M doc/equations/ibeta12.svg M doc/equations/ibeta2.svg M doc/equations/ibeta3.svg M doc/equations/ibeta4.svg M doc/equations/ibeta5.svg M doc/equations/ibeta6.svg M doc/equations/ibeta7.svg M doc/equations/ibeta8.svg M doc/equations/ibeta9.svg M doc/equations/ibeta_inv1.svg M doc/equations/ibeta_inv2.svg M doc/equations/ibeta_inv3.svg M doc/equations/ibeta_inv4.svg M doc/equations/ibeta_inv5.svg M doc/equations/ibeta_inv6.svg M doc/equations/ibeta_inv7.svg M doc/equations/ibeta_inv8.svg M doc/equations/igamma1.svg M doc/equations/igamma10.svg M doc/equations/igamma11.svg M doc/equations/igamma11b.svg M doc/equations/igamma12.svg M doc/equations/igamma13.svg M doc/equations/igamma16.svg M doc/equations/igamma17.svg M doc/equations/igamma18.svg M doc/equations/igamma19.svg M doc/equations/igamma1f.svg M doc/equations/igamma2.svg M doc/equations/igamma2f.svg M doc/equations/igamma3.svg M doc/equations/igamma4.svg M doc/equations/igamma5.svg M doc/equations/igamma6.svg M doc/equations/igamma7.svg M doc/equations/igamma8.svg M doc/equations/igamma9.svg M doc/equations/jacobi1.svg M doc/equations/jacobi2.svg M doc/equations/jacobi3.svg M doc/equations/jacobi4.svg M doc/equations/laguerre_0.svg M doc/equations/laguerre_1.svg M doc/equations/laguerre_2.svg M doc/equations/laguerre_3.svg M doc/equations/lanczos0.svg M doc/equations/lanczos0a.svg M doc/equations/lanczos0b.svg M doc/equations/lanczos1.svg M doc/equations/lanczos2.svg M doc/equations/lanczos3.svg M doc/equations/lanczos4.svg M doc/equations/lanczos5.svg M doc/equations/lanczos6.svg M doc/equations/lanczos7.svg M doc/equations/laplace_pdf.svg M doc/equations/legendre_0.svg M doc/equations/legendre_1.svg M doc/equations/legendre_1b.svg M doc/equations/legendre_2.svg M doc/equations/legendre_3.svg M doc/equations/legendre_4.svg M doc/equations/legendre_5.svg M doc/equations/lgamm1.svg M doc/equations/lgamm2.svg M doc/equations/lgamm3.svg M doc/equations/lgamm4.svg M doc/equations/lgamm5.svg M doc/equations/lgamm6.svg M doc/equations/log1pseries.svg M doc/equations/lognormal_ref.svg M doc/equations/mbessel1.svg M doc/equations/mbessel10.svg M doc/equations/mbessel11.svg M doc/equations/mbessel12.svg M doc/equations/mbessel13.svg M doc/equations/mbessel14.svg M doc/equations/mbessel15.svg M doc/equations/mbessel16.svg M doc/equations/mbessel17.svg M doc/equations/mbessel2.svg M doc/equations/mbessel3.svg M doc/equations/mbessel4.svg M doc/equations/mbessel5.svg M doc/equations/mbessel6.svg M doc/equations/mbessel7.svg M doc/equations/mbessel8.svg M doc/equations/mbessel9.svg M doc/equations/nc_beta_ref1.svg M doc/equations/nc_beta_ref2.svg M doc/equations/nc_beta_ref3.svg M doc/equations/nc_beta_ref4.svg M doc/equations/nc_chi_squ_ref1.svg M doc/equations/nc_chi_squ_ref2.svg M doc/equations/nc_chi_squ_ref3.svg M doc/equations/nc_chi_squ_ref4.svg M doc/equations/nc_chi_squ_ref5.svg M doc/equations/nc_chi_squ_ref6.svg M doc/equations/nc_chi_squ_ref7.svg M doc/equations/nc_f_ref1.svg M doc/equations/nc_f_ref2.svg M doc/equations/nc_t_ref1.svg M doc/equations/nc_t_ref2.svg M doc/equations/nc_t_ref3.svg M doc/equations/nc_t_ref4.svg M doc/equations/nc_t_ref5.svg M doc/equations/neg_binomial_ref.svg M doc/equations/normal_ref1.svg M doc/equations/poisson_ref1.svg M doc/equations/roots1.svg M doc/equations/roots2.svg M doc/equations/roots3.svg M doc/equations/roots4.svg M doc/equations/sbessel1.svg M doc/equations/sbessel2.svg M doc/equations/sbessel3.svg M doc/equations/sbessel4.svg M doc/equations/sbessel5.svg M doc/equations/special_functions_blurb1.svg M doc/equations/special_functions_blurb15.svg M doc/equations/special_functions_blurb17.svg M doc/equations/special_functions_blurb18.svg M doc/equations/special_functions_blurb20.svg M doc/equations/special_functions_blurb22.svg M doc/equations/special_functions_blurb5.svg M doc/equations/special_functions_blurb6.svg M doc/equations/special_functions_blurb7.svg M doc/equations/spherical_0.svg M doc/equations/spherical_1.svg M doc/equations/spherical_2.svg M doc/equations/spherical_3.svg M doc/equations/students_t_dist.svg M doc/equations/students_t_ref1.svg M doc/equations/zeta1.svg M doc/equations/zeta2.svg M doc/equations/zeta3.svg M doc/equations/zeta4.svg M doc/equations/zeta5.svg M doc/equations/zeta6.svg M doc/graphs/acosh.svg M doc/graphs/airy_ai.svg M doc/graphs/airy_aip.svg M doc/graphs/airy_bi.svg M doc/graphs/airy_bip.svg M doc/graphs/asinh.svg M doc/graphs/atanh.svg M doc/graphs/bernoulli_cdf.svg M doc/graphs/bernoulli_pdf.svg M doc/graphs/beta.svg M doc/graphs/beta_pdf.svg M doc/graphs/binomial_pdf_1.svg M doc/graphs/binomial_pdf_2.svg M doc/graphs/cauchy_pdf1.svg M doc/graphs/cauchy_pdf2.svg M doc/graphs/cbrt.svg M doc/graphs/chi_squared_pdf.svg M doc/graphs/cyl_bessel_i.svg M doc/graphs/cyl_bessel_j.svg M doc/graphs/cyl_bessel_k.svg M doc/graphs/cyl_neumann.svg M doc/graphs/digamma.svg M doc/graphs/ellint_1.svg M doc/graphs/ellint_2.svg M doc/graphs/ellint_3.svg M doc/graphs/ellint_carlson.svg M doc/graphs/erf.svg M doc/graphs/erf_inv.svg M doc/graphs/erfc.svg M doc/graphs/erfc_inv.svg M doc/graphs/expint2.svg M doc/graphs/expint_i.svg M doc/graphs/expm1.svg M doc/graphs/exponential_pdf.svg M doc/graphs/extreme_value_pdf1.svg M doc/graphs/extreme_value_pdf2.svg M doc/graphs/fisher_f_pdf.svg M doc/graphs/gamma1_pdf.svg M doc/graphs/gamma2_pdf.svg M doc/graphs/gamma_p.svg M doc/graphs/gamma_q.svg M doc/graphs/hermite.svg M doc/graphs/hypergeometric_pdf_1.svg M doc/graphs/hypergeometric_pdf_2.svg M doc/graphs/ibeta.svg M doc/graphs/jacobi_cd.svg M doc/graphs/jacobi_cn.svg M doc/graphs/jacobi_cs.svg M doc/graphs/jacobi_dc.svg M doc/graphs/jacobi_dn.svg M doc/graphs/jacobi_ds.svg M doc/graphs/jacobi_nc.svg M doc/graphs/jacobi_nd.svg M doc/graphs/jacobi_ns.svg M doc/graphs/jacobi_sc.svg M doc/graphs/jacobi_sd.svg M doc/graphs/jacobi_sn.svg M doc/graphs/laguerre.svg M doc/graphs/laplace_pdf.svg M doc/graphs/legendre_p.svg M doc/graphs/legendre_q.svg M doc/graphs/lgamma.svg M doc/graphs/log1p.svg M doc/graphs/logistic_pdf.svg M doc/graphs/lognormal_pdf1.svg M doc/graphs/lognormal_pdf2.svg M doc/graphs/nc_beta_pdf.svg M doc/graphs/nc_f_pdf.svg M doc/graphs/nc_t_pdf.svg M doc/graphs/nccs_pdf.svg M doc/graphs/negative_binomial_pdf_1.svg M doc/graphs/negative_binomial_pdf_2.svg M doc/graphs/normal_pdf.svg M doc/graphs/pareto_pdf1.svg M doc/graphs/pareto_pdf2.svg M doc/graphs/poisson_pdf_1.svg M doc/graphs/powm1.svg M doc/graphs/rayleigh_cdf.svg M doc/graphs/rayleigh_pdf.svg M doc/graphs/sinc_pi.svg M doc/graphs/sinhc_pi.svg M doc/graphs/sph_bessel.svg M doc/graphs/sph_neumann.svg M doc/graphs/sqrt1pm1.svg M doc/graphs/students_t_pdf.svg M doc/graphs/tgamma.svg M doc/graphs/tgamma_delta_ratio.svg M doc/graphs/triangular_cdf.svg M doc/graphs/triangular_pdf.svg M doc/graphs/uniform_cdf.svg M doc/graphs/uniform_pdf.svg M doc/graphs/weibull_pdf1.svg M doc/graphs/weibull_pdf2.svg M doc/graphs/zeta1.svg M doc/graphs/zeta2.svg Entering 'libs/move' ... Entering 'libs/multiprecision' M doc/floating_point_eg1.svg M doc/floating_point_eg2.svg M doc/floating_point_eg3.svg Entering 'libs/numeric/conversion' ... Entering 'libs/pool' M doc/images/mb1.svg M doc/images/mb2.svg M doc/images/mb3.svg M doc/images/mb4.svg M doc/images/pc1.svg M doc/images/pc2.svg M doc/images/pc3.svg M doc/images/pc4.svg M doc/images/pc5.svg Entering 'libs/predef' ... Entering 'tools/inspect' Entering 'tools/litre' Entering 'tools/quickbook'
All the "modified" files appear to be .bat, .vcproj, and .svg files (although there was one file, example/ml02_distance_strategy.cpp in libs/geometry). I thought it might be a problem with .gitattributes files. When I looked at them, I noticed an unfamiliar attribute, svneol=native. I expected to find eol=crlf for the .bat and .vcproj files. I don't have autocrlf or safecrlf set in my ~.gitconfig file (should I?). What is the svneol attribute? What am I missing?
--
Some more info that I should have included: - Fedora 20 - git version 1.8.3.1 Mike

On 31 Oct 2013 at 1:12, Cox, Michael wrote:
All the "modified" files appear to be .bat, .vcproj, and .svg files (although there was one file, example/ml02_distance_strategy.cpp in libs/geometry). I thought it might be a problem with .gitattributes files. When I looked at them, I noticed an unfamiliar attribute, svneol=native. I expected to find eol=crlf for the .bat and .vcproj files. I don't have autocrlf or safecrlf set in my ~.gitconfig file (should I?). What is the svneol attribute? What am I missing?
Some more info that I should have included: - Fedora 20 - git version 1.8.3.1
FYI to those interested, this problem is exactly what my patches to Boost2Git fixed. Dave backed those out for good reason (loss of ancient data). We are discussing off list what to do instead - I gave Dave some more options to ponder. Niall -- Currently unemployed and looking for work. Work Portfolio: http://careers.stackoverflow.com/nialldouglas/

From: s_sourceforge@nedprod.com To: boost@lists.boost.org Date: Thu, 31 Oct 2013 12:12:39 -0400 Subject: Re: [boost] [git help] Cloning the boost git repository recursively seems to have issues. On 31 Oct 2013 at 1:12, Cox, Michael wrote:
All the "modified" files appear to be .bat, .vcproj, and .svg files (although there was one file, example/ml02_distance_strategy.cpp in libs/geometry). I thought it might be a problem with .gitattributes files. When I looked at them, I noticed an unfamiliar attribute, svneol=native. I expected to find eol=crlf for the .bat and .vcproj files. I don't have autocrlf or safecrlf set in my ~.gitconfig file (should I?). What is the svneol attribute? What am I missing?
Some more info that I should have included: - Fedora 20 - git version 1.8.3.1
FYI to those interested, this problem is exactly what my patches to Boost2Git fixed. Dave backed those out for good reason (loss of ancient data). We are discussing off list what to do instead - I gave Dave some more options to ponder. Is there a local change that I can make that would make the situation better?

On 1 Nov 2013 at 0:37, Ahmed Charles wrote:
Is there a local change that I can make that would make the situation better?
Yes. # Remove everything from the index. git rm --cached -r . # Write both the index and working directory from git's database. git reset --hard # Prepare to make a commit by staging all the files that will get normalized. # This is your chance to inspect which files were never normalized. You should # get lots of messages like: "warning: CRLF will be replaced by LF in file." git add . # Commit git commit -m "Normalize line endings" The painful part is you'll need to execute this for every git submodule :( Niall -- Currently unemployed and looking for work. Work Portfolio: http://careers.stackoverflow.com/nialldouglas/

From: s_sourceforge@nedprod.com To: boost@lists.boost.org Date: Fri, 1 Nov 2013 13:05:56 -0400 Subject: Re: [boost] [git help] Cloning the boost git repository recursively seems to have issues. On 1 Nov 2013 at 0:37, Ahmed Charles wrote:
Is there a local change that I can make that would make the situation better?
Yes. # Remove everything from the index. git rm --cached -r . # Write both the index and working directory from git's database. git reset --hard # Prepare to make a commit by staging all the files that will get normalized. # This is your chance to inspect which files were never normalized. You should # get lots of messages like: "warning: CRLF will be replaced by LF in file." git add . # Commit git commit -m "Normalize line endings" The painful part is you'll need to execute this for every git submodule :( I was hoping for one that didn't involve a commit, since when Boost2Git runs, all the commits change and I can't cherry-pick the fix on top of a working directory that contains dirty files that will also change with the cherry-pick. _______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost

On 1 Nov 2013 at 12:04, Ahmed Charles wrote:
I was hoping for one that didn't involve a commit, since when Boost2Git runs, all the commits change and I can't cherry-pick the fix on top of a working directory that contains dirty files that will also change with the cherry-pick.
True. If you don't mind running Boost2Git yourself, you could merge my EOL fix patchset to Boost2Git at https://github.com/ryppl/Boost2Git/pull/42. That patchset does inline EOL fixups during conversion, so the output is all EOL correct and therefore git does not flag files as being modified. Niall -- Currently unemployed and looking for work. Work Portfolio: http://careers.stackoverflow.com/nialldouglas/
participants (3)
-
Ahmed Charles
-
Cox, Michael
-
Niall Douglas