This repository was archived by the owner on Sep 11, 2020. It is now read-only.
Worktree.Reset refactor and Soft, Merge, Hard and Mixed modes #572
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
Codecov Report
@@ Coverage Diff @@
## master #572 +/- ##
==========================================
- Coverage 78.01% 77.45% -0.56%
==========================================
Files 129 129
Lines 9855 9895 +40
==========================================
- Hits 7688 7664 -24
- Misses 1328 1405 +77
+ Partials 839 826 -13
Continue to review full report at Codecov.
|
erizocosmico
reviewed
Sep 1, 2017
submodule.go
Outdated
| @@ -90,7 +93,7 @@ func (s *Submodule) status(idx *index.Index) (*SubmoduleStatus, error) { | |||
| err = nil | |||
| } | |||
|
|
|||
| return status, err | |||
| return status, nil | |||
There was a problem hiding this comment.
Are we intentionally discarding the error here? If so, the previous if can be removed.
| name = ch.From.String() | ||
| } | ||
|
|
||
| _, _ = idx.Remove(name) |
There was a problem hiding this comment.
can this operation fail? If so, should we leave it unhandled?
There was a problem hiding this comment.
the only error returned by Remove, is ErrEntryNotFound and we don't care about it.
| if err := w.rmIndexFromFile(name, idx); err != nil { | ||
| return err | ||
| } | ||
| _, _ = idx.Remove(name) |
There was a problem hiding this comment.
same, should we ignore this error?
| @@ -503,6 +556,7 @@ func (w *Worktree) checkoutFileSymlink(f *object.File) (err error) { | |||
| } | |||
|
|
|||
| func (w *Worktree) addIndexFromTreeEntry(name string, f *object.TreeEntry, idx *index.Index) error { | |||
| _, _ = idx.Remove(name) | |||
| @@ -513,6 +567,7 @@ func (w *Worktree) addIndexFromTreeEntry(name string, f *object.TreeEntry, idx * | |||
| } | |||
|
|
|||
| func (w *Worktree) addIndexFromFile(name string, h plumbing.Hash, idx *index.Index) error { | |||
| _, _ = idx.Remove(name) | |||
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.
Fixes #435 #415