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, 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 https://github.com/git-for-windows/git/issues/1315 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 11, 2019 at 01:23 UTC
3aef54e8b82bc02b9cebbb7d0bed8911ee0418e3
1 file changed
+2
diff.c
+2
@@ -4207,6 +4207,8 @@ static void run_external_diff(const char *pgm,
4207
argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
4208
argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
4209
4210
+ diff_free_filespec_data(one);
4211
+ diff_free_filespec_data(two);
4212
if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
4213
die(_("external diff died, stopping at %s"), name);
4214