Skip to content

Commit ee2b0ce

Browse files
committed
diff: munmap() file contents before running external diff
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. So let's make sure that `git diff` itself is not holding any open handle to the files in question. This fixes git-for-windows#1315 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 4a79717 commit ee2b0ce

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

diff.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3818,6 +3818,10 @@ static void run_external_diff(const char *pgm,
38183818
argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
38193819
argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
38203820

3821+
if (one && one->should_munmap)
3822+
diff_free_filespec_data(one);
3823+
if (two && two->should_munmap)
3824+
diff_free_filespec_data(two);
38213825
if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
38223826
die(_("external diff died, stopping at %s"), name);
38233827

0 commit comments

Comments
 (0)