I am fine on OSX

obrienbiometrics:20190125-log-898-adjust-cd-master michaelobrien$ git clone 
https://gerrit.onap.org/r/integration
Cloning into 'integration'...
remote: Counting objects: 448, done
remote: Finding sources: 100% (24/24)
remote: Total 17720 (delta 0), reused 17713 (delta 0)
Receiving objects: 100% (17720/17720), 6.74 MiB | 9.56 MiB/s, done.
Resolving deltas: 100% (8132/8132), done.
obrienbiometrics:20190125-log-898-adjust-cd-master michaelobrien$ cd 
integration/
obrienbiometrics:integration michaelobrien$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean


From: [email protected] <[email protected]> On Behalf Of 
Yang Bin
Sent: Tuesday, January 29, 2019 11:54 PM
To: [email protected]; Yang, Bin <[email protected]>; 
[email protected]; Yang Xu (Yang, Fixed Network) <[email protected]>
Subject: Re: [onap-discuss][integration] anything wrong with integration repo?

Hi Gary,

It seems Line ending issue which cannot resolved from local workstation.

I did tests on both Ubuntu and windows 7, the modified files varies according 
to different platform as below:


Ubuntu:

root@cc1c32311231:~/integration# git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   docs/files/figure1.png
        modified:   docs/files/figure10.png
        modified:   docs/files/figure11.png
        modified:   docs/files/figure12.png
        modified:   docs/files/figure13.png
        modified:   docs/files/figure2.png
       modified:   docs/files/figure3.png
        modified:   docs/files/figure4.png
        modified:   docs/files/figure5.png
        modified:   docs/files/figure6.png
        modified:   docs/files/figure7.png
        modified:   docs/files/figure8.png
        modified:   docs/files/figure9.png
        modified:   test/postman/images/collection-detail-test.png
        modified:   test/postman/images/collection-detail.png
        modified:   test/postman/images/collections.png
        modified:   test/postman/images/globals.png
        modified:   test/postman/images/import.png
        modified:   test/postman/images/run.png
        modified:   test/postman/images/zipfile.png

no changes added to commit (use "git add" and/or "git commit -a")
root@cc1c32311231:~/integration# git diff 
test/postman/images/collection-detail.png
warning: CRLF will be replaced by LF in 
test/postman/images/collection-detail.png.
The file will have its original line endings in your working directory.
diff --git a/test/postman/images/collection-detail.png 
b/test/postman/images/collection-detail.png
index 59b7db2..d8097b4 100755
Binary files a/test/postman/images/collection-detail.png and 
b/test/postman/images/collection-detail.png differ




Windows 7:



BYang2@PEK-BYANG2-L2 MINGW64 /c/workspace/onap/projects/temp1/integration 
(master)
$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   test/postman/images/collection-detail-test.png
        modified:   test/postman/images/collection-detail.png
        modified:   test/postman/images/collections.png
        modified:   test/postman/images/globals.png
        modified:   test/postman/images/import.png
        modified:   test/postman/images/run.png
        modified:   test/postman/images/zipfile.png

no changes added to commit (use "git add" and/or "git commit -a")

BYang2@PEK-BYANG2-L2 MINGW64 /c/workspace/onap/projects/temp1/integration 
(master)
$ git diff test/postman/images/collection-detail.png
diff --git a/test/postman/images/collection-detail.png 
b/test/postman/images/collection-detail.png
index 59b7db2..d8097b4 100755
Binary files a/test/postman/images/collection-detail.png and 
b/test/postman/images/collection-detail.png differ
warning: CRLF will be replaced by LF in 
test/postman/images/collection-detail.png.
The file will have its original line endings in your working directory.




Best Regards,
Bin Yang,    Solution Engineering Team,    Wind River
ONAP Multi-VIM/Cloud PTL
Direct +86,10,84777126    Mobile +86,13811391682    Fax +86,10,64398189
Skype: yangbincs993

From: [email protected]<mailto:[email protected]> 
[mailto:[email protected]] On Behalf Of Yang Bin
Sent: Wednesday, January 30, 2019 9:18 AM
To: [email protected]<mailto:[email protected]>; 
[email protected]<mailto:[email protected]>; Yang Xu (Yang, Fixed Network)
Subject: Re: [onap-discuss][integration] anything wrong with integration repo?

Hi Gary,

Nothing changes after 'get reset --hard'

I didn't do settings changes recently...

Best Regards,
Bin Yang,    Solution Engineering Team,    Wind River
ONAP Multi-VIM/Cloud PTL
Direct +86,10,84777126    Mobile +86,13811391682    Fax +86,10,64398189
Skype: yangbincs993

From: [email protected]<mailto:[email protected]> 
[mailto:[email protected]] On Behalf Of Gary Wu
Sent: Wednesday, January 30, 2019 9:05 AM
To: Yang, Bin; [email protected]<mailto:[email protected]>; 
Yang Xu (Yang, Fixed Network)
Subject: Re: [onap-discuss][integration] anything wrong with integration repo?

Hi Bin,

I have not.  Do you perhaps have some sort of user- or system-level settings on 
linefeed corrections (core.autocrlf) on PNG files?  What happens if you do git 
reset --hard ?

Thanks,
Gary

From: Yang, Bin [mailto:[email protected]]
Sent: Tuesday, January 29, 2019 4:57 PM
To: [email protected]<mailto:[email protected]>; Gary Wu 
<[email protected]<mailto:[email protected]>>; Yang Xu (Yang, Fixed 
Network) <[email protected]<mailto:[email protected]>>
Subject: [onap-discuss][integration] anything wrong with integration repo?

Hi Integration team,

Have you ever observed following issue while cloning git repo of integration 
project? The git status indicates there are modified files as below even with a 
fresh 'git clone' operation?  And the status prevents me from stash/checkout 
branch.

BTW: I am not the only one to observe such issue, anyone could help?

Thanks

root@cc1c32311231:~/integration# git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   docs/files/figure1.png
        modified:   docs/files/figure10.png
        modified:   docs/files/figure11.png
        modified:   docs/files/figure12.png
        modified:   docs/files/figure13.png
        modified:   docs/files/figure2.png
        modified:   docs/files/figure3.png
        modified:   docs/files/figure4.png
        modified:   docs/files/figure5.png
        modified:   docs/files/figure6.png
       modified:   docs/files/figure7.png
        modified:   docs/files/figure8.png
        modified:   docs/files/figure9.png
        modified:   test/postman/images/collection-detail-test.png
        modified:   test/postman/images/collection-detail.png
        modified:   test/postman/images/collections.png
        modified:   test/postman/images/globals.png
        modified:   test/postman/images/import.png
        modified:   test/postman/images/run.png
        modified:   test/postman/images/zipfile.png




Best Regards,
Bin Yang,    Solution Engineering Team,    Wind River
ONAP Multi-VIM/Cloud PTL
Direct +86,10,84777126    Mobile +86,13811391682    Fax +86,10,64398189
Skype: yangbincs993


This email and the information contained herein is proprietary and confidential 
and subject to the Amdocs Email Terms of Service, which you may review at 
https://www.amdocs.com/about/email-terms-of-service 
<https://www.amdocs.com/about/email-terms-of-service>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#15233): https://lists.onap.org/g/onap-discuss/message/15233
Mute This Topic: https://lists.onap.org/mt/29589343/21656
Group Owner: [email protected]
Unsubscribe: https://lists.onap.org/g/onap-discuss/unsub  
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to