diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-26 02:47:36 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-26 02:47:36 +0300 |
| commit | 362f869ff2dbc389234ecd8c4b996a9e507c39d7 (patch) | |
| tree | 077586c50787e0a4469311aa15e7059f731825c5 /notes-merge.c | |
| parent | 0a01df08c03fe707e22795de7bd1d763ed02e9e1 (diff) | |
| parent | 6ee36364eb32287f071878a91d3bbcd86313754a (diff) | |
Merge branch 'ab/diff-free-more'
Leakfixes.
* ab/diff-free-more:
diff.[ch]: have diff_free() free options->parseopts
diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c index 01d596920e..878b6c571b 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -175,7 +175,6 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o, oid_to_hex(&mp->remote)); } diff_flush(&opt); - clear_pathspec(&opt.pathspec); *num_changes = len; return changes; @@ -261,7 +260,6 @@ static void diff_tree_local(struct notes_merge_options *o, oid_to_hex(&mp->local)); } diff_flush(&opt); - clear_pathspec(&opt.pathspec); } static void check_notes_merge_worktree(struct notes_merge_options *o) |