fix the git add issue

[jianzhangbjz]

Fix #797, steps as below, @ecordell @njhale Correct me if I'm wrong.

mac:operator-lifecycle-manager jianzhang$ git stash
Saved working directory and index state WIP on master: 9ba3512c Merge pull request #741 from njhale/sub-status-proposal
mac:operator-lifecycle-manager jianzhang$ git add .
mac:operator-lifecycle-manager jianzhang$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	modified:   vendor/github.com/sirupsen/logrus/.gitignore
	modified:   vendor/github.com/sirupsen/logrus/CHANGELOG.md
	modified:   vendor/github.com/sirupsen/logrus/README.md
	modified:   vendor/github.com/sirupsen/logrus/entry.go
	modified:   vendor/github.com/sirupsen/logrus/exported.go
	modified:   vendor/github.com/sirupsen/logrus/formatter.go
	modified:   vendor/github.com/sirupsen/logrus/go.mod
	modified:   vendor/github.com/sirupsen/logrus/go.sum
	modified:   vendor/github.com/sirupsen/logrus/json_formatter.go
	modified:   vendor/github.com/sirupsen/logrus/logger.go
	modified:   vendor/github.com/sirupsen/logrus/logrus.go
	modified:   vendor/github.com/sirupsen/logrus/text_formatter.go
	modified:   vendor/github.com/sirupsen/logrus/writer.go

mac:operator-lifecycle-manager jianzhang$ git commit -m "fix the git add issue"
[master 1ef64f5b] fix the git add issue
 13 files changed, 48 insertions(+), 352 deletions(-)

[openshift-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jianzhangbjz
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: jpeeler

If they are not already assigned, you can assign the PR to them by writing /assign @jpeeler in a comment when ready.

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[jianzhangbjz]

/test e2e-aws-olm

[jianzhangbjz]

/test e2e-aws-olm

[jianzhangbjz]

/test e2e-aws-olm

[jpeeler]

I don't think this PR is correct, though it's clear that somehow something got out of sync based on your git status output. The lower case version of logrus (github.com/sirupsen/logrus) should be at v1.2.0 while the upper case version (github.com/Sirupsen/logrus) should be at v1.1.0. This PR is changing the lower case version to v1.1.0.

Are you still seeing this issue on a fresh clone? This is so close to the recent rebase (March 28th) that I'm wondering if that is somehow related.

[njhale]

@jianzhangbjz @jpeeler It looks like this is an issue with case sensitivity and git on OSX - in this case around Sirupsen vs. sirupsen. I managed to get rid of one of them in #805 but at some point we should probably create a follow up that sets the correct git case settings in a .gitattributes file.

@jianzhangbjz If you're on OSX and you find yourself unable to check out the latest remote OLM due to the issue, you can run something like git fetch --all && git rm -rf vendor && git commit -m "throw away" && git reset --hard <olm-remote>/master.

[jianzhangbjz]

@jpeeler @njhale Sorry for the late to reply. Many thanks for your suggestions! It works now by following the below steps:

$ git fetch  --all
$ git rm -rf vendor
$ git commit -m "throw away xxx"
$ git reset --hard origin/master
mac:operator-lifecycle-manager jianzhang$ git status
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
mac:operator-lifecycle-manager jianzhang$ git log
commit 33ccf629ecf1aa0f46a0acf7875fe97a37d5e499 (HEAD -> master, origin/release-4.1, origin/release-4.0, origin/master, origin/HEAD)
Merge: 4de8dd1a ab2f6721
Author: OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>
Date:   Sat Apr 13 17:26:53 2019 -0700

    Merge pull request #811 from ecordell/progressing-timestamp
    
    chore(cvo): report progressing=true if the version has updated
...