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)
This commit is contained in:
@ -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)
|
||||
|
||||
Reference in New Issue
Block a user