When performing a pull, sync IRIS with repository changes using diff output rather than command output #517
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 is intended as a hopefully superior and simpler alternative to #515 to address the same issue, though only for git pull for now. Files are not always able to be reliably imported when their names are truncated in the git pull stats summary.
The truncated git pull stat summary output is no longer used and diff output is used instead. This should allow all file types to be handled without requiring any new or custom IRIS logic. The diff is performed after the git pull to avoid a potential double fetch and also a potential race condition if the remote changes between the diff and pull taking place.
Also indirectly addresses, for pulls only, the following likely unreported/unknown issues associated with the truncated name expansion logic that I have discovered in recent days, by no longer using that logic:
A B C.lut
) are now able to be successfully imported. Other files where this is possible may be similarly improved.Have tested the following scenarios locally and seems to work well:
Have not made changes to the WebUI related logic in
RunGitCommandWithInput
as there did not seem to currently be any actual uses of it for pulls.Nothing has been done for rebase as it appears to only be used within the context of
MergeDefaultRemoteBranch
which already performs a similar diff after the rebase takes place and does not seem to be affected by the same importing issues.Nothing has been done for merge which may be affected by the same import issue. It appears that it is only used from WebUI but is not a feature that I have ever actually used so have not spent much time looking into it.