Skip to content

Commit d9beb46

Browse files
committed
Merge branch 'js/unmap-before-ext-diff'
Windows update. * js/unmap-before-ext-diff: diff: munmap() file contents before running external diff
2 parents 43ba21c + 3aef54e commit d9beb46

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

diff.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4209,6 +4209,8 @@ static void run_external_diff(const char *pgm,
42094209
argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
42104210
argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
42114211

4212+
diff_free_filespec_data(one);
4213+
diff_free_filespec_data(two);
42124214
if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
42134215
die(_("external diff died, stopping at %s"), name);
42144216

0 commit comments

Comments
 (0)