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

push: Transfer the git-annex even when --data=nothing #4786

Merged
merged 2 commits into from Jul 31, 2020

Conversation

kyleam
Copy link
Collaborator

@kyleam kyleam commented Jul 30, 2020

This resolves gh-4780 by cherry picking a commit from @mih's gh-4693 and adding a regression test.

mih and others added 2 commits Jul 30, 2020
Instead of splitting between regular branches and the git-annex branch,
in order to improve efficiency -- in particular with expensive
operations in custom git-remote-helper implementations.

Fixes dataladgh-4667

(cherry picked from commit 17541fa)
dataladgh-4780 pointed out that `datalad push --data=nothing` should still
push the git-annex branch.  It turns out the optimization in
17541fa (OPT: Consolidate on a single `git-push` call in `push()`,
2020-07-12, dataladgh-4693) already fixed this, so it was cherry picked to
maint in the last commit.

Add a regression test.

Closes datalad#4780.
@mih
Copy link
Member

mih commented Jul 31, 2020

Restarted failing tests (looked spurious).

@codecov
Copy link

codecov bot commented Jul 31, 2020

Codecov Report

Merging #4786 into maint will decrease coverage by 0.09%.
The diff coverage is 84.98%.

Impacted file tree graph

@@            Coverage Diff             @@
##            maint    #4786      +/-   ##
==========================================
- Coverage   89.68%   89.58%   -0.10%     
==========================================
  Files         275      288      +13     
  Lines       37103    40280    +3177     
==========================================
+ Hits        33275    36086    +2811     
- Misses       3828     4194     +366     
Impacted Files Coverage Δ
datalad/config.py 96.90% <ø> (+0.30%) ⬆️
datalad/core/local/run.py 98.70% <ø> (ø)
datalad/core/local/save.py 98.68% <ø> (ø)
datalad/distributed/create_sibling_gitlab.py 74.67% <ø> (ø)
...ad/distributed/tests/test_create_sibling_gitlab.py 100.00% <ø> (ø)
datalad/distribution/create_sibling_github.py 83.87% <ø> (+0.26%) ⬆️
datalad/distribution/drop.py 98.79% <ø> (ø)
datalad/distribution/install.py 98.87% <ø> (ø)
datalad/distribution/tests/test_create_github.py 95.77% <ø> (+0.18%) ⬆️
datalad/interface/tests/test_unlock.py 97.91% <ø> (-0.18%) ⬇️
... and 356 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 55200cd...e11bb22. Read the comment docs.

@mih
Copy link
Member

mih commented Jul 31, 2020

Worked, merging!

@mih mih merged commit f7f15b9 into datalad:maint Jul 31, 2020
2 of 4 checks passed
@kyleam
Copy link
Collaborator Author

kyleam commented Jul 31, 2020

Restarted failing tests (looked spurious).

Thanks.

Worked, merging!

And thanks.

@kyleam kyleam deleted the push-git-annex-no-data branch Jul 31, 2020
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.

None yet

2 participants