diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 20:59:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 20:59:21 (GMT) |
| commit | d9beb468e6d0c493eed00e365d90a69127488caa (patch) | |
| tree | 008d7ea46d0ea09f4d4527e1c0fb2b2e2e72095d /diff.c | |
| parent | 43ba21cb574ee3f9a1acf4580868982f4c883ac6 (diff) | |
| parent | 3aef54e8b82bc02b9cebbb7d0bed8911ee0418e3 (diff) | |
| download | git-d9beb468e6d0c493eed00e365d90a69127488caa.zip git-d9beb468e6d0c493eed00e365d90a69127488caa.tar.gz git-d9beb468e6d0c493eed00e365d90a69127488caa.tar.bz2 | |
Merge branch 'js/unmap-before-ext-diff'
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
@@ -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); |