diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:38:11 (GMT) |
| commit | 58f6cfd8ce3c4621d4a772b81b7c92f7519154f1 (patch) | |
| tree | d32b6120fb20627d449f0de0a43a2a8ba84ba432 /diff.c | |
| parent | 9147e5ae08d711071fadfc232830831654bf335e (diff) | |
| parent | 3aef54e8b82bc02b9cebbb7d0bed8911ee0418e3 (diff) | |
| download | git-58f6cfd8ce3c4621d4a772b81b7c92f7519154f1.zip git-58f6cfd8ce3c4621d4a772b81b7c92f7519154f1.tar.gz git-58f6cfd8ce3c4621d4a772b81b7c92f7519154f1.tar.bz2 | |
Merge branch 'js/unmap-before-ext-diff' into maint
Windows update.
* js/unmap-before-ext-diff:
diff: munmap() file contents before running external diff
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -4206,6 +4206,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); |