Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/unmap-before-ext-diff' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 29 Jul 2019 19:38:11 +0000
(12:38 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 29 Jul 2019 19:38:11 +0000
(12:38 -0700)
Windows update.
* js/unmap-before-ext-diff:
diff: munmap() file contents before running external diff
diff.c
patch
|
blob
|
history
raw
(from parent 1:
9147e5a
)
diff --git
a/diff.c
b/diff.c
index a654d46f6a93de96d85706c7373ef0d617081a21..1ccd96bbfde23a0f6d42104e81f78e0953c1bc93 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-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);