Skip to content

Commit 84740c1

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 #1315 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 0400f1c commit 84740c1

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
@@ -3097,6 +3097,10 @@ static void run_external_diff(const char *pgm,
30973097
argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
30983098
argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
30993099

3100+
if (one && one->should_munmap)
3101+
diff_free_filespec_data(one);
3102+
if (two && two->should_munmap)
3103+
diff_free_filespec_data(two);
31003104
if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
31013105
die(_("external diff died, stopping at %s"), name);
31023106

0 commit comments

Comments
 (0)