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

Fix GitRepo.get_branch_commits_() to handle branch names conflicts with paths #6661

Merged
merged 1 commit into from
Apr 28, 2022

Conversation

mih
Copy link
Member

@mih mih commented Apr 28, 2022

Specifically, conflicts of branch name with branch content.

Changelog

🐛 Bug Fixes

Specifically, conflicts of branch name with with branch content.

Fixes datalad#6650
@mih mih added semver-patch Increment the patch version when merged team-git Git interface (GitRepo, protocols, helpers, ...) (https://github.com/datalad/datalad/issues/6365) labels Apr 28, 2022
@codecov
Copy link

codecov bot commented Apr 28, 2022

Codecov Report

Merging #6661 (b583f66) into maint (6dfb47f) will decrease coverage by 0.49%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##            maint    #6661      +/-   ##
==========================================
- Coverage   91.17%   90.67%   -0.50%     
==========================================
  Files         353      353              
  Lines       44496    44498       +2     
==========================================
- Hits        40568    40348     -220     
- Misses       3928     4150     +222     
Impacted Files Coverage Δ
datalad/support/gitrepo.py 90.82% <100.00%> (+<0.01%) ⬆️
datalad/support/tests/test_gitrepo.py 99.77% <100.00%> (+<0.01%) ⬆️
datalad/metadata/extractors/xmp.py 24.07% <0.00%> (-68.52%) ⬇️
datalad/metadata/extractors/tests/test_xmp.py 40.90% <0.00%> (-59.10%) ⬇️
datalad/metadata/tests/test_extract_metadata.py 54.05% <0.00%> (-45.95%) ⬇️
datalad/metadata/extract_metadata.py 69.44% <0.00%> (-30.56%) ⬇️
datalad/log.py 81.67% <0.00%> (-13.95%) ⬇️
datalad/cmd.py 83.07% <0.00%> (-11.03%) ⬇️
datalad/support/tests/test_sshconnector.py 91.97% <0.00%> (-6.80%) ⬇️
datalad/ui/progressbars.py 76.00% <0.00%> (-6.29%) ⬇️
... and 24 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6dfb47f...b583f66. Read the comment docs.

@yarikoptic yarikoptic changed the title Fix GitRepo.get_branch_commits_() to handle branch names conflicts Fix GitRepo.get_branch_commits_() to handle branch names conflicts with paths Apr 28, 2022
@yarikoptic
Copy link
Member

Looks LGTM. Travis - the same story with a tag as in another PR today

======================================================================
FAIL: datalad.tests.test_version.test__version__
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/dl-miniconda-1iv9f8d4/lib/python3.9/site-packages/nose/case.py", line 198, in runTest
    self.test(*self.arg)
  File "/home/travis/build/datalad/datalad/datalad/tests/test_version.py", line 61, in test__version__
    ok_startswith(__version__, changelog_version)
  File "/home/travis/build/datalad/datalad/datalad/tests/utils.py", line 451, in ok_startswith
    ok_(s.startswith(prefix),
AssertionError: String '0.16.1+29.g6f34f19' doesn't start with '0.16.2'

@github-actions
Copy link

🚀 PR was released in 0.16.3 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
released semver-patch Increment the patch version when merged team-git Git interface (GitRepo, protocols, helpers, ...) (https://github.com/datalad/datalad/issues/6365)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants