Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maint

diff --git a/pathspec.c b/pathspec.c
index c9e9b6c0778c755fcade1430cf674dfd867050f1..24e0dd52322baf4a507765ae0948c98f0ec30602 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -489,7 +489,7 @@ void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
               sizeof(struct pathspec_item) * dst->nr);
 }
 
-void free_pathspec(struct pathspec *pathspec)
+void clear_pathspec(struct pathspec *pathspec)
 {
        free(pathspec->items);
        pathspec->items = NULL;