Compare current branch to target - don't assume already on target branch locally

[danlester]

Otherwise switching branches doesn't work as per issue #124

This just uses the git syntax:

git log ..origin/branchname

instead of the old

git log branchname..origin/branchname

In the old case, this failed when the local repo wasn't already on branchname:

fatal: ambiguous argument 'branchname..origin/branchname': unknown revision or path not in the working tree.

[welcome]

Thanks for submitting your first pull request! You are awesome! 🤗

If you haven't done so already, check out Jupyter's Code of Conduct. Also, please make sure you followed the pull request template, as this will help us review your contribution more quickly.

You can meet the other Jovyans by joining our Discourse forum. There is also a intro thread there where you can stop by and say Hi! 👋

Welcome to the Jupyter community! 🎉

[manics]

Sounds reasonable to me. Can anyone else foresee any problems?

[consideRatio]

The function find_upstream_changed where this is run, is called once to detect the added files in comparison to the local and current branch instead of the local branch of the same name.

I'm not 100%, but I think it can make sense to compare the current local branch rather than the local repos branch of the same name..

If I follow the logic, the find_upstream_changed is called from rename_local_untracked which is modifying the local files without changing branch in between. With that said, I conclude this is a clear improvement of the logic as it becomes at least consistent with the idea to change the current branch, as compared to inconsistent with both the logic of switching branch first and changing that.

[welcome]

Congrats on your first merged pull request in this project! 🎉

Thank you for contributing, we are very proud of you! ❤️

[consideRatio]

Thank you @jhgoodwin, @danlester, and @manics for reporting, suggesting a resolution, and reviewing it! ❤️ 🎉