New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Can't show blame when VSCode starts on branch without upstream #343

Closed
benzittlau opened this Issue Apr 16, 2018 · 7 comments

Comments

Projects
None yet
3 participants
@benzittlau

benzittlau commented Apr 16, 2018

  • GitLens Version: 8.2.1
  • VSCode Version: 1.22.2
  • OS Version: OS X 10.13.1

Steps to Reproduce:

  1. Open VSCode while on a branch without an upstream
  2. Toggle Line Blame Annotations

I'm encountering an issue where if VSCode launches while the project directory is on a branch that doesn't have an upstream, attempts to toggle file blame annotations will fail with the error:

No upstream configured for branch <branch name>

development_rb_ _jobber

I attempted to enable "gitlens.outputLevel": "verbose", to record any output, but no output was visible in the output pane after adding that setting and restarting VSCode.

@benzittlau

This comment has been minimized.

benzittlau commented Apr 16, 2018

Just saw the same issue after:

  1. Start VSCode on a branch with an upstream
  2. Switch to a branch without an upstream
  3. Open a new file
  4. Toggle Line Blame Annotations

It appears that once it gets into this state it stays broken (if I switch back to master with an upstream I continue to get the error trying to toggle the annotations on the newly opened file).

@eamodio

This comment has been minimized.

Owner

eamodio commented Apr 19, 2018

I think this is related to a casing issue in the git error messages. I've switched to use case insensitive matching and hopefully that will resolve this.

@eamodio eamodio self-assigned this Apr 19, 2018

@eamodio eamodio added this to the Soon™ milestone Apr 19, 2018

@eamodio eamodio closed this in 9089de7 Apr 19, 2018

@benzittlau

This comment has been minimized.

benzittlau commented Apr 22, 2018

@eamodio You just made my day! Confirmed locally that with version 8.2.3 I am no longer seeing this issue. Thanks for your active support of this project!

@eamodio

This comment has been minimized.

Owner

eamodio commented Apr 22, 2018

Awesome glad to hear it is actually fixed! 😄

@ryenus

This comment has been minimized.

Contributor

ryenus commented Jun 1, 2018

I still have this issue on with 8.3.3 :-(

@ryenus

This comment has been minimized.

Contributor

ryenus commented Jun 1, 2018

Here the error I got is.

> git rev-parse --symbolic-full-name my_branch@{u}
fatal: upstream branch 'refs/heads/my_branch' not stored as a remote-tracking branch

Git version 2.17.1

@ryenus

This comment has been minimized.

Contributor

ryenus commented Jun 1, 2018

FYI, I've created pull request #390.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment