mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-19 00:49:17 +02:00
Code

Merge branch 'js/unmap-before-ext-diff' 

Windows update.

* js/unmap-before-ext-diff:
  diff: munmap() file contents before running external diff
This commit is contained in:
Junio C Hamano 2019-07-25 13:59:21 -07:00
parent 43ba21cb57 3aef54e8b8
commit d9beb468e6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@ -4209,6 +4209,8 @@ static void run_external_diff(const char *pgm,
argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
diff_free_filespec_data(one);
diff_free_filespec_data(two);
if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
die(_("external diff died, stopping at %s"), name);