Uploaded image for project: 'Couchbase .NET client library'
  1. Couchbase .NET client library
  2. NCBC-1758

Add .gitattributes to normalise end of line formatting

    XMLWordPrintable

Details

    • Improvement
    • Status: Resolved
    • Minor
    • Resolution: Duplicate
    • None
    • 2.7.0
    • None
    • None
    • 1

    Attachments

      No reviews matched the request. Check your Options in the drop-down menu of this sections header.

      Activity

        jmorris Jeff Morris added a comment - - edited

        On my my machine this commit always ends up showing a number of files have changes if I pull master. See screen shot.

        I removed my old .gitconfig settings and even deleted and re-cloned couchbase-net-client. As soon as I open up git batch the files show changes which I am guessing are related to the commit.

        jmorris Jeff Morris added a comment - - edited On my my machine this commit always ends up showing a number of files have changes if I pull master. See screen shot. I removed my old .gitconfig settings and even deleted and re-cloned couchbase-net-client. As soon as I open up git batch the files show changes which I am guessing are related to the commit.
        jmorris Jeff Morris added a comment -

        [5:51 PM] Jae Park: hmm something is wrong. when I clone couchbase-net-client then 'git status' shows almost all codes are showing as modified immediately after clone. core.autocrlf true/input/false none of them allow me to get unchanged codes
        [5:51 PM] Jae Park: thus, when I checkout the gerrit, it fails because git sees there are changes are not commited

        jmorris Jeff Morris added a comment - [5:51 PM] Jae Park: hmm something is wrong. when I clone couchbase-net-client then 'git status' shows almost all codes are showing as modified immediately after clone. core.autocrlf true/input/false none of them allow me to get unchanged codes [5:51 PM] Jae Park: thus, when I checkout the gerrit, it fails because git sees there are changes are not commited

        I've reverted the change and CI is now working again - it looks to be something to do with the Couchbase.Tests & Couchbase.Tests.Managmeent projects, even after fixing the whitespace issues, they continued to fail.

        mike.goldsmith Michael Goldsmith added a comment - I've reverted the change and CI is now working again - it looks to be something to do with the Couchbase.Tests & Couchbase.Tests.Managmeent projects, even after fixing the whitespace issues, they continued to fail.
        jmorris Jeff Morris added a comment -

        Michael Goldsmith -

        As soon as you stash or revert the changes made, the .gitattribute settings are triggered again...so you are always stuck on master with a bunch of files that have been modified do to changes to the line endings. I had to delete the .gitattributes file then do a git checkout – . to switch to a different branch/commit. That could be what's going wrong with the tests.

        FWIW, I am fine with switching to the project level .gitattributes if we can get this fixed for multi-environment situations (windows, osx, linux) - my settings for line-endings are currently user level. It would be nice to have the settings at the project level and not hidden in a user's root .gitconfig file.  

        jmorris Jeff Morris added a comment - Michael Goldsmith - As soon as you stash or revert the changes made, the .gitattribute settings are triggered again...so you are always stuck on master with a bunch of files that have been modified do to changes to the line endings. I had to delete the .gitattributes file then do a git checkout – . to switch to a different branch/commit. That could be what's going wrong with the tests. FWIW, I am fine with switching to the project level .gitattributes if we can get this fixed for multi-environment situations (windows, osx, linux) - my settings for line-endings are currently user level. It would be nice to have the settings at the project level and not hidden in a user's root .gitconfig file.  
        jmorris Jeff Morris added a comment -

        Resolved by this issue/commit: NCBC-1712

        jmorris Jeff Morris added a comment - Resolved by this issue/commit: NCBC-1712

        People

          mike.goldsmith Michael Goldsmith
          mike.goldsmith Michael Goldsmith
          Votes:
          0 Vote for this issue
          Watchers:
          3 Start watching this issue

          Dates

            Created:
            Updated:
            Resolved:

            Gerrit Reviews

              There are no open Gerrit changes

              PagerDuty