Skip to content
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

Disambiguates checking out a tracking branch #71

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

nkakouros
Copy link

When a repo contains a file named the same as a potential remote branch, then git checkout <name> fails because git does not know what to checkout, the file or the branch.

git checkout <name> -- clarifies that it is the branch the user wants.

@retr0h retr0h force-pushed the master branch 3 times, most recently from 7f69361 to 54f2a58 Compare March 14, 2020 18:49
@retr0h
Copy link
Owner

retr0h commented Mar 14, 2020

@nkakouros can you fix unit tests please?

@nkakouros nkakouros force-pushed the checkout-disambiguation branch from 41432cd to c809ff3 Compare March 17, 2020 12:51
@nkakouros
Copy link
Author

nkakouros commented Mar 17, 2020

I am not familiar with writing test and currently lack the time to look into them.

@nkakouros nkakouros force-pushed the checkout-disambiguation branch from c809ff3 to 79c7779 Compare March 17, 2020 13:29
@nkakouros nkakouros closed this Sep 23, 2020
@nkakouros nkakouros reopened this Sep 23, 2020
@nkakouros
Copy link
Author

I tried taking a look at the tests. However, when I run tox (even in the master branch) I get the following errors:


Required test coverage of 95.0% reached. Total coverage: 95.45%
====================================================================================================== 80 passed, 5 warnings in 9.27s =======================================================================================================
py37 create: /home/nikos/Projects/gilt/.tox/py37
SKIPPED: InterpreterNotFound: python3.7
doc create: /home/nikos/Projects/gilt/.tox/doc
doc installdeps: -rdoc-requirements.txt
ERROR: invocation failed (exit code 1), logfile: /home/nikos/Projects/gilt/.tox/doc/log/doc-1.log
================================================================================================================= log start =================================================================================================================
ERROR: Could not open requirements file: [Errno 2] No such file or directory: 'doc-requirements.txt'
WARNING: You are using pip version 20.1.1; however, version 20.2.3 is available.
You should consider upgrading via the '/home/nikos/Projects/gilt/.tox/doc/bin/python -m pip install --upgrade pip' command.

================================================================================================================== log end ==================================================================================================================
ERROR: could not install deps [-rdoc-requirements.txt]; v = InvocationError('/home/nikos/Projects/gilt/.tox/doc/bin/python -m pip install -rdoc-requirements.txt', 1)
__________________________________________________________________________________________________________________ summary __________________________________________________________________________________________________________________
  format-check: commands succeeded
  lint: commands succeeded
  py36: commands succeeded
SKIPPED:  py37: InterpreterNotFound: python3.7
ERROR:   doc: could not install deps [-rdoc-requirements.txt]; v = InvocationError('/home/nikos/Projects/gilt/.tox/doc/bin/python -m pip install -rdoc-requirements.txt', 1)

If I understand correctly this means that the tests do not run for python 3.7 for some reason. Could you help me debug this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants