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

Git Pull command #97

Closed
sirnewton01 opened this issue Aug 12, 2018 · 7 comments
Closed

Git Pull command #97

sirnewton01 opened this issue Aug 12, 2018 · 7 comments
Assignees

Comments

@sirnewton01
Copy link
Collaborator

sirnewton01 commented Aug 12, 2018

Dgit has a push, but not pull command, which causes "go get -u" to fail. Once this is implemented, the go-get-tests.sh has commented out tests for it.

@sirnewton01
Copy link
Collaborator Author

@driusan what would be involved with pull?

@driusan
Copy link
Owner

driusan commented Aug 13, 2018

I don't think it would involve much. pull is basically just git fetch && git merge, both of which are implemented. The hardest part would probably be parsing the command line in the same way as the real git client and making sure they get passed properly to the right subcommand.

I'm not 100% sure if 3-way merge is working correctly (especially when there's conflicts), but with all the read-tree tests I've been doing lately it should be getting pretty close to reliable and even without it git pull would work with fast-forward pulls if implemented that way.

@sirnewton01 sirnewton01 self-assigned this Aug 13, 2018
@sirnewton01
Copy link
Collaborator Author

Thanks, I'll see what I can do with this, even if just simple fast forward is implemented it would satisfy go get -u.

@sirnewton01
Copy link
Collaborator Author

It seems like this would be relatively simple to hook into the existing fetch/merge with some limitations. There are a number of problems encountered with merge. See #99

@sirnewton01
Copy link
Collaborator Author

#106 implements pull well enough to pull from a remote repository such as GitHub, but it lacks the ability to do local repositories. Once the pull request is merged this enhancement should remain probably remain open so that other protocols such as local files is implemented. The go_get_complete tag could be removed at that point.

@driusan
Copy link
Owner

driusan commented Aug 18, 2018

Is the problem with the pull command, or is the problem with the fetch command? If it's fetch, we should probably make a separate, more specific issue.

@sirnewton01
Copy link
Collaborator Author

Ah, fait point. Ok, I'm closing this and raising a fetch enhancement.

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

No branches or pull requests

2 participants