GitSavvy: pull --rebase broken
Hello, I have got a bug with pull/rebase - it is not working after last update.
- Sublime: 3126
- git version 2.13.4
- MacOS Sierra 10.12.6
Status:
BRANCH: On branch `testing` tracking `origin/testing`.
You're ahead by 1 and behind by 4.
ROOT: ~/test_repo
HEAD: 6864c4b35 Test it
Your working directory is clean.
Git pull console:
`/usr/bin/git pull origin testing:testing` failed with following output:
From git+ssh://git.example.com/test_repo
! [rejected] testing -> testing (non-fast-forward)
Reproduce:
- Get repository, with tracking branch
- Configure git for pull --rebase
- Commit to repo (without push)
- Commit to repo from another machine and push
- Shift+Command+P git pull
- Error
In debug log interesting moment same:
{
"stdout": "",
"command": [
"pull",
"origin",
"testing:testing"
],
"stderr": "From git+ssh://git.example.com/test_repo\n ! [rejected] testing -> testing (non-fast-forward)\n",
"stdin": null,
"secounds": 1.0345990657806396,
"type": "git"
},
{
"error": "'`/usr/bin/git pull origin testing:testing` failed with following output:\\n\\nFrom git+ssh://git.example.com/test_repo\\n ! [rejected] testing -> testing (non-fast-forward)\\n'",
"type": "error"
},
P.S. Hostname rewritten
About this issue
- Original URL
- State: closed
- Created 7 years ago
- Reactions: 2
- Comments: 17 (3 by maintainers)
I have prepared a PR which only pull to the active branch: https://github.com/divmain/GitSavvy/pull/736