This repository was archived by the owner on Sep 11, 2020. It is now read-only.
remote: pull refactor to match default behavior of cgit #511
Conversation
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
smola
approved these changes
Jul 27, 2017
| @@ -27,7 +27,7 @@ is supported by go-git. | |||
| | tag | ✔ | | |||
| | **sharing and updating projects** | | |||
| | fetch | ✔ | | |||
| | pull | ✔ | | |||
| | pull | ✔ | Only supports merges where the merge can be resolved as a fast-forward. | | |||
There was a problem hiding this comment.
Maybe reword as Only supports fast-forward merges
There was a problem hiding this comment.
is copy from the git documentation
| @@ -36,6 +37,8 @@ type Worktree struct { | |||
| // Pull incorporates changes from a remote repository into the current branch. | |||
| // Returns nil if the operation is successful, NoErrAlreadyUpToDate if there are | |||
| // no changes to be fetched, or an error. | |||
| // | |||
| // Pull only supports merges where the can be resolved as a fast-forward. | |||
There was a problem hiding this comment.
Maybe reword, see previous comment.
| @@ -44,6 +47,8 @@ func (w *Worktree) Pull(o *PullOptions) error { | |||
| // branch. Returns nil if the operation is successful, NoErrAlreadyUpToDate if | |||
| // there are no changes to be fetched, or an error. | |||
| // | |||
| // Pull only supports merges where the can be resolved as a fast-forward. | |||
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR implement the default behavior of cgit, until now Pull was wrongly implemented changing the branch instead of merging the incoming branch into the current HEAD.
Fixes #470