search

kostmo / circleci-failure-tracker

A log analyzer for CircleCI. Note that this project is now hosted at pytorch/dr-ci
https://github.com/pytorch/dr-ci
5 stars 2 forks source link

rebase instructions: `origin` might not be main pytorch repo #78

Closed kostmo closed 4 years ago

kostmo commented 4 years ago

See this comment. Somebody's fork, using the remote named origin, might not contain the viable/strict branch, in which case they see the error message:

fatal: Needed a single revision
invalid upstream 'viable/strict'

Current rebase advice:

git fetch origin viable/strict git rebase viable/strict

Proposed new advice:

git fetch https://github.com/pytorch/pytorch viable/strict git rebase FETCH_HEAD

cc @ezyang, @mpariente

mpariente commented 4 years ago

Thanks for looking into this. Was I wrong about this? I couldn't make it work otherwise.

kostmo commented 4 years ago

More specifically, I think the problem is that viable/strict did not exist as a local branch. To avoid forcing users to create this local branch, and to not tie it to any specific named remote, I propose this as the rebase instructions:

git fetch https://github.com/pytorch/pytorch viable/strict
git rebase FETCH_HEAD

@ezyang, what do you think?

ezyang commented 4 years ago

You could do that. I personally always say git rebase origin/viable/strict to prevent it from being ambiguous.