commit ca065523c617fad68a4d85a971bbbe69125d93c1
author Junio C Hamano <gitster@pobox.com> Wed Nov 25 15:24:53 2020 -0800
committer Junio C Hamano <gitster@pobox.com> Wed Nov 25 15:24:53 2020 -0800
tree d5935aa8e537677b2ac17fc09a153d7dccc2dba9
parent 2ba70a330be354aab60f1db6f8b6670d707dd615
parent d44e5267eaefb27521e4ed2655358b0282add239

Merge branch 'rs/plug-diff-cache-leak'

Memleak fix.

* rs/plug-diff-cache-leak:
  diff-lib: plug minor memory leaks in do_diff_cache()

diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index 082e249..b73cc18 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -606,10 +606,12 @@
 
 	repo_init_revisions(opt->repo, &revs, NULL);
 	copy_pathspec(&revs.prune_data, &opt->pathspec);
+	diff_setup_done(&revs.diffopt);
 	revs.diffopt = *opt;
 
 	if (diff_cache(&revs, tree_oid, NULL, 1))
 		exit(128);
+	clear_pathspec(&revs.prune_data);
 	return 0;
 }