Merge branch 'ew/gc-auto-pack-limit-fix'

diff --git a/combine-diff.c b/combine-diff.c
index 8f2313d5022326dc244fa8eba4a8640299ebeac8..5920df8b8dd12ff382131a6753f40bbdec64fd37 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1525,7 +1525,7 @@ void diff_tree_combined(const unsigned char *sha1,
                free(tmp);
        }
 
-       free_pathspec(&diffopts.pathspec);
+       clear_pathspec(&diffopts.pathspec);
 }
 
 void diff_tree_combined_merge(const struct commit *commit, int dense,