SanderRonde / VSCode-Gerrit

Gerrit plugin for VSCode
https://marketplace.visualstudio.com/items?itemName=SanderRonde.vscode--gerrit
MIT License
31 stars 17 forks source link

Seems that can not send patchset from non master local branch #84

Closed joguy56 closed 2 weeks ago

joguy56 commented 3 weeks ago

Trying to send a patchset onto master from a local branch a named by myself.

When trying to send the new patchset, it tries to rebase the branch that does not exists remotely and fails at sending the new patchset.

Here are logs for analysis:

Tried to run "git pull --rebase", but failed
Stdout: 
Stderr: There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=<remote>/<branch> nc_session_start

Error: Command failed: git pull --rebase
There is no tracking information for the current branch.
Please specify which branch you want to rebase against.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=<remote>/<branch> nc_session_start

Tried to run "git rebase --abort", but failed
Stdout: 
Stderr: fatal: No rebase in progress?

Error: Command failed: git rebase --abort
fatal: No rebase in progress?
SanderRonde commented 2 weeks ago

Thanks for the report! Should be fixed in the next release which is live now (1.2.50)

joguy56 commented 1 week ago

Hello,

Still have an issue with this local branch.

GET request to "https://gerrite1.ext.net.nokia.com/a/changes/RFSW%2FINTERNAL%2Ffoam~master~Iaa8884d423ea59bbeb831de22d7ee0211a4170a2/detail/?o=CURRENT_REVISION&o=CURRENT_FILES"
Tried to run "git rev-parse --abbrev-ref --symbolic-full-name @{u}", but failed
Stdout: 
Stderr: fatal: no upstream configured for branch 'nc_session_start'

Error: Command failed: git rev-parse --abbrev-ref --symbolic-full-name @{u}
fatal: no upstream configured for branch 'nc_session_start'

GET request to "https://gerrite1.ext.net.nokia.com/a/changes/Iaa8884d423ea59bbeb831de22d7ee0211a4170a2/detail/?o=CURRENT_REVISION&o=CURRENT_FILES"
GET request to "https://gerrite1.ext.net.nokia.com/a/changes/Iaa8884d423ea59bbeb831de22d7ee0211a4170a2/detail/?o=CURRENT_REVISION&o=CURRENT_FILES"

If I just call : git review

It works perfectly.

SanderRonde commented 1 week ago

Ah figured it out. It wouldn't throw an error anymore but would silently fail. Should actually be fixed in the latest version (1.2.52)

joguy56 commented 1 week ago

You impresses me... really. So fast for answering.

Many thanks