diff: release all handles before running external diff #213
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
|
/submit |
|
Submitted as [email protected] |
This comment has been minimized.
This comment has been minimized.
![gitgitgadget[bot]](https://avatars.githubusercontent.com/in/12836?s=60&v=4){kind=small}
When running an external diff from, say, a diff tool, it is safe to assume that we want to write the files in question. On Windows, that means that there cannot be any other process holding an open handle to said files, or even just a mapped region. So let's make sure that `git diff` itself is not holding any open handle to the files in question. In fact, we will just release the file pair right away, as the external diff uses the files we just wrote, so we do not need to hold the file contents in memory anymore. This fixes git-for-windows#1315 Signed-off-by: Johannes Schindelin <[email protected]>
dscho
force-pushed
the
munmap-before-ext-diff
branch
from
bef83fc to
8a02132
Compare
|
/submit |
|
Submitted as [email protected] |
|
This branch is now known as |
|
This patch series was integrated into pu via git@2de7515. |
|
This patch series was integrated into pu via git@3779829. |
|
This patch series was integrated into pu via git@6116512. |
|
This patch series was integrated into pu via git@28c319b. |
|
This patch series was integrated into next via git@7aa292c. |
|
This patch series was integrated into pu via git@b54ebd0. |
|
This patch series was integrated into pu via git@44d6127. |
|
This patch series was integrated into pu via git@d9beb46. |
|
This patch series was integrated into next via git@d9beb46. |
|
This patch series was integrated into master via git@d9beb46. |
|
Closed via d9beb46. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
On Windows, it is not possible to overwrite a file as long as any process holds a read handle to it. Even keeping regions memory-mapped prevents that.
When
git difftoolcallsgit diff, it might be the user's intention to write the file(s) via the diff tool, so let's make sure that they are not memory-mapped at that stage.Changes since v1: