Test and fix pull - #93
Merged
Merged
Conversation
white-gecko
force-pushed
the
feature/testAndFixPull
branch
from
January 2, 2018 13:40
1fdfeea to
472c8ba
Compare
white-gecko
force-pushed
the
feature/testAndFixPull
branch
3 times, most recently
from
January 5, 2018 16:41
459742a to
12014aa
Compare
white-gecko
force-pushed
the
feature/testAndFixPull
branch
from
January 6, 2018 10:19
0a105b4 to
41b9350
Compare
white-gecko
force-pushed
the
feature/testAndFixPull
branch
from
January 7, 2018 15:28
2372ff5 to
f2c0f11
Compare
white-gecko
force-pushed
the
feature/testAndFixPull
branch
4 times, most recently
from
January 9, 2018 14:25
be9083d to
866ba05
Compare
splattater
reviewed
Jan 10, 2018
| """Fetch from remote. | ||
|
|
||
| Arguments: | ||
| remote -- The remote repository that is the source of the pull operation. The remote with its |
Contributor
There was a problem hiding this comment.
pull operation -> fetch operation
splattater
reviewed
Jan 10, 2018
| HTTP Response 201: If merge was possible and a merge commit was created | ||
| HTTP Response 400: If merge did not work | ||
| HTTP Response 409: If merge produces a conflict | ||
| """ |
Contributor
There was a problem hiding this comment.
Described status codes did not match the codes that will be returned
splattater
reviewed
Jan 10, 2018
| HTTP Response 200: If push was possible | ||
| HTTP Response 400: If push did not work | ||
| HTTP Response 409: If push produces a conflict on the remote end | ||
| """ |
Contributor
There was a problem hiding this comment.
Described status codes did not match the codes that will be returned
splattater
approved these changes
Jan 10, 2018
splattater
left a comment
splattater
left a comment
Contributor
There was a problem hiding this comment.
There are only some minor issues with docstrings in git.py (API) that don't match the underlaying code (HTTP status), everything else is fine.
I also opened an issue to add a test for the introduced exception.
white-gecko
force-pushed
the
feature/testAndFixPull
branch
from
January 11, 2018 14:43
a1f4ce6 to
a050f9d
Compare
- Allow pulling from remotes which are not named "origin" - we can now also produce a merge conflict. #FroheWeihnachten - Fix Push/Pull/Fetch/Merge API
- Add syncAll to git API
- tests for empty repository is disabled, due to #81
white-gecko
force-pushed
the
feature/testAndFixPull
branch
from
January 11, 2018 15:03
a050f9d to
952895b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #60
TODO
feature/provenancefeature/provenance