From: | John Harvey <john(dot)harvey(at)crunchydata(dot)com> |
---|---|
To: | pgsql-jdbc(at)postgresql(dot)org |
Subject: | Today's pgjdbc release causing git clone issues |
Date: | 2015-11-03 22:33:40 |
Message-ID: | CABcP5fgnq6WY0aTG3kx_JSeN4-cMxpB2Dg=QYrpuXKPryRiwsQ@mail.gmail.com |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-jdbc |
Hello,
I have a question about today's release of pgjdbc. I tried cloning down
the code on a RHEL7 box today, and I was confused when I couldn't switch
branches because of a conflict. I looked into it a little deeper, and
tried the following procedure:
git clone https://github.com/pgjdbc/pgjdbc.git
cd pgjdbc
git status
In running that command, 4 files have been auto-modified on the clone:
# modified: org/postgresql/test/ssl/SslTest.java
# modified: org/postgresql/translation/de.po
# modified: org/postgresql/util/PGTime.java
# modified: org/postgresql/util/PGTimestamp.java
This is unusual behavior for me. What's even stranger is that I cannot
switch branches because some of these files have conflicts. Doing some
research, I see that the new .gitattributes file has the following line in
it:
* text=auto
I found a link that discusses this issue a bit:
http://stackoverflow.com/questions/28145664/ignore-text-auto-in-gitattributes-file
Unfortunately, I've tried everything in the post, and the only thing that
works is to immediately git reset after clone, or to modify the
.gitattributes file.
Is this desired behavior? Does anyone have a suggestion what I need to do
to work around it?
Thank you,
-John
From | Date | Subject | |
---|---|---|---|
Next Message | Dave Cramer | 2015-11-03 22:55:08 | Re: Today's pgjdbc release causing git clone issues |
Previous Message | Dave Cramer | 2015-11-03 21:12:06 | JDBC 9.4 1205 released |