From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 29 Nov 2019 21:11:41 +0000 (+0000)
Subject: add-interactive: make sure to release `rev.prune_data`
X-Git-Tag: v2.25.0-rc0~34^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c3944a628e46f6abb1add20f19641c5bbef8a1a;p=thirdparty%2Fgit.git

add-interactive: make sure to release `rev.prune_data`

During a review, Junio Hamano pointed out that the `rev.prune_data` was
copied from another pathspec but never cleaned up.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/add-interactive.c b/add-interactive.c
index d6cb98cd40..de2fccb0ef 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -435,6 +435,9 @@ static int get_modified_files(struct repository *r, struct string_list *files,
 			rev.diffopt.flags.ignore_dirty_submodules = 1;
 			run_diff_files(&rev, 0);
 		}
+
+		if (ps)
+			clear_pathspec(&rev.prune_data);
 	}
 	hashmap_free_entries(&s.file_map, struct pathname_entry, ent);