This repository was archived by the owner on Sep 11, 2020. It is now read-only.
Worktree.Add: Support Add deleted files, fixes #571 #577
Conversation
This file contains 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
added 4 commits
September 4, 2017 16:06
…us its associated test. Fixed, what I think, a false positive in TestFilenameNormalization in worktree_test.go.
|
I cannot reproduce that error. Any idea why ? |
|
Its a test randomly failing, don't worry |
mcuadros
suggested changes
Sep 4, 2017
worktree_status.go
Outdated
| @@ -266,6 +266,23 @@ func (w *Worktree) Add(path string) (plumbing.Hash, error) { | |||
| return h, err | |||
| } | |||
|
|
|||
| func (w *Worktree) removeIfDeleted(path string, hash plumbing.Hash, err error) (plumbing.Hash, error) { | |||
| pathError, ok := err.(*os.PathError) | |||
| if ok && pathError.Op == "lstat" || w.isErrNotExist(err) { | |||
There was a problem hiding this comment.
Can you use the built-in functionos.IsNotExist?
Codecov Report
@@ Coverage Diff @@
## master #577 +/- ##
==========================================
- Coverage 78.01% 77.46% -0.56%
==========================================
Files 129 129
Lines 9922 9941 +19
==========================================
- Hits 7741 7701 -40
- Misses 1338 1410 +72
+ Partials 843 830 -13
Continue to review full report at Codecov.
|
mcuadros
suggested changes
Sep 5, 2017
worktree_status.go
Outdated
| @@ -266,6 +266,19 @@ func (w *Worktree) Add(path string) (plumbing.Hash, error) { | |||
| return h, err | |||
| } | |||
|
|
|||
| func (w *Worktree) removeIfDeleted(path string, hash plumbing.Hash, err error) (plumbing.Hash, error) { | |||
| pathError, ok := err.(*os.PathError) | |||
There was a problem hiding this comment.
you don't need to do the cast or check if is a lsstat, the function is smart enough for detect any non-existan file
There was a problem hiding this comment.
Also I rather having the if condition where the err is generated instead of having another function. Thanks
added 2 commits
September 5, 2017 10:09
mcuadros
changed the title
mcuadros
approved these changes
Sep 5, 2017
# for free
to subscribe to this conversation on GitHub.
Already have an account?
#.
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.
In order to fix the bug mentioned in the issue, I modified the Add method of Worktree to handle the case where a file is removed but is still in the repository.
My fix just ensure that the repo and the filesystem are always in sync.
I also found what I think to be a false positive in the TestFilenameNormalization test.
The wrong file were added.