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

BF: process included files before the rest #700

Merged
merged 21 commits into from Dec 11, 2017

Conversation

@yarikoptic
Copy link
Collaborator

@yarikoptic yarikoptic commented Nov 27, 2017

Alternative solution to #628 - may be I have missed why it was more complex than 1 line change? ;)

  • Closes #627
  • includes test
  • also some minor refactoring to tests.lib to provide SkipTest, and skipIf

It also includes disabled (well -- raises SkipTest) for the fact that in current logic processing of included files is done not right at the point of inclusion. That makes it behave differently from stock git config

Byron and others added 3 commits Sep 28, 2017
Fixes #637
yarikoptic added 2 commits Nov 27, 2017
Merged 2.1.7 into master (just VERSION changes)
@codecov-io
Copy link

@codecov-io codecov-io commented Nov 28, 2017

Codecov Report

Merging #700 into master will increase coverage by 1.82%.
The diff coverage is 93.24%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #700      +/-   ##
==========================================
+ Coverage   92.83%   94.65%   +1.82%     
==========================================
  Files          61       60       -1     
  Lines       10152     9344     -808     
==========================================
- Hits         9425     8845     -580     
+ Misses        727      499     -228
Impacted Files Coverage Δ
git/test/test_submodule.py 99.23% <ø> (+1.71%) ⬆️
git/refs/log.py 93.84% <0%> (ø) ⬆️
git/repo/base.py 95.96% <0%> (+0.67%) ⬆️
git/config.py 92.76% <100%> (+0.32%) ⬆️
git/test/test_util.py 98.52% <100%> (+10.29%) ⬆️
git/diff.py 99.11% <100%> (ø) ⬆️
git/exc.py 96.42% <100%> (ø) ⬆️
git/test/test_config.py 98.33% <100%> (+0.08%) ⬆️
git/compat.py 65.03% <100%> (+0.21%) ⬆️
git/test/test_commit.py 100% <100%> (ø) ⬆️
... and 22 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 a2cd130...0a6cb4a. Read the comment docs.

@yarikoptic
Copy link
Collaborator Author

@yarikoptic yarikoptic commented Nov 28, 2017

I guess I will wait for #702 to be merged first so we could get travis pass here as well

yarikoptic and others added 3 commits Dec 1, 2017
BF (codename "happy travis"): trying to address lints etc to make Travis green again
…into yarikoptic-bf-includes
@Byron Byron merged commit 03126bf into gitpython-developers:master Dec 11, 2017
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Byron
Copy link
Member

@Byron Byron commented Dec 11, 2017

@yarikoptic As always, thanks so much for chiming in :)! I merged the referenced 'make travis happy' branch in, and it seems to work just fine.

@yarikoptic yarikoptic deleted the yarikoptic:bf-includes branch Dec 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.