[postgis-devel] Current master branch of postgis causing clone issues ?

[John Harvey]

Hi Regina,

Thanks for your reply.

Ok, I think I know the issue and can explain it.
I *believe* that the 2 batch files were actually committed with LF-only.

Here's how I'll try to prove it:
First, let's grab the raw file from *before* the Tiger 2016 commit:
git show 2a35bea:extras/tiger_geocoder/create_geocode.bat >
~/before_create_geocode.bat

That command may look weird, but I'm doing it this way to prevent any
gitattribute changes or git config changes.

Second, let's grab the raw file *from* the Tiger 2016 commit
git show 598fea:extras/tiger_geocoder/create_geocode.bat >
~/after_create_geocode.bat

When I open ~/before_create_geocode.bat in a hex editor, I see that each
line ends in "$0D0A", i.e. CRLF
However, when I open ~/after_create_geocode.bat, I see that each line now
only ends in "$0A", i.e LF.  So, the CR was dropped in the last commit.
That's why in my environment (a mac, using git), the .gitattributes file
starts "fixing" things to be "$0D0A".

I've also verified that my pull-request I've sent in does contain the right
raw $0D0A endlines.
I know that it's an SVN project, so that may not be helpful-- I can try to
produce a patch-file if possible (or whatever you need).

Regards,
  -John

On Thu, Aug 25, 2016 at 11:00 AM, Regina Obe <lr at pcorp.us> wrote:

> John,
>
> The .gitattributes ignore has been there for some time I think.  So that
> isn't new.
>
>
>
> I did make commit to those two last batch files on 8/17.  Looking at the
> carriage return type they look like crlf to me.
>
> Then again I'm on windows so things usually come down that way anyway
> unless explicitly set in gitattributes.
>
>
>
> When I do a git clone and git status I get:
>
>
>
> On branch svn-trunk
>
> Your branch is up-to-date with 'origin/svn-trunk'.
>
> nothing to commit, working directory clean
>
>
>
> Perhaps someone not on windows can check and see if they are seeing the
> same thing.
>
> It might be something introduced by the mirroring, because github is not
> our official repo.  We still use SVN so when I commit I commit on the svn
> repo and it gets mirrored to github.
>
>
>
> Thanks,
>
> Regina
>
>
>
>
>
>
>
>
>
> *From:* postgis-devel [mailto:postgis-devel-bounces at lists.osgeo.org] *On
> Behalf Of *John Harvey
> *Sent:* Thursday, August 25, 2016 10:19 AM
> *To:* PostGIS Development Discussion <postgis-devel at lists.osgeo.org>
> *Subject:* [postgis-devel] Current master branch of postgis causing clone
> issues ?
>
>
>
> Hello all,
>
>
>
> I see something weird in PostGIS at the moment.
>
> When I do:
>
> mkdir ~/git
>
> cd ~/git
>
> git clone git at github.com:postgis/postgis.git
>
> cd postgis
>
> git status
>
>
>
> I notice the following:
>
>             modified:   extras/tiger_geocoder/create_geocode.bat
>
>             modified:   extras/tiger_geocoder/upgrade_geocoder.bat
>
>
>
> Although, I didn't modify these files.  I just did a regular clone.
>
>
>
> I suspect the .gitattributes file has something to do with it.
>
> The 2 files impacted are Windows files, so probably have the wrong
> carriage-return type.
>
> And, in the .gitattributes file, I see this rule:
>
> *.bat       eol=crlf
>
> So, I think this forces a change after clone.
>
>
>
> I suspect this problem was introduced in the latest commit from 8/17 (it
> seems the endline changes were committed there).
>
>
>
> Does anyone else see this problem?  Is this something that can be fixed?
>
>
>
> Thanks!
>
>   -John Harvey
>
> _______________________________________________
> postgis-devel mailing list
> postgis-devel at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/postgis-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/postgis-devel/attachments/20160825/3afca096/attachment.html>