Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move

diff --git a/pathspec.c b/pathspec.c
index 828405021fca4214585e1d46b65f604d14e61143..a5f4df31eab7fd465c2e68c7a400287756c34c51 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -1,5 +1,6 @@
 #define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
+#include "config.h"
 #include "dir.h"
 #include "pathspec.h"
 #include "attr.h"
@@ -662,7 +663,6 @@ void clear_pathspec(struct pathspec *pathspec)
                        attr_check_free(pathspec->items[i].attr_check);
        }
 
-       free(pathspec->items);
-       pathspec->items = NULL;
+       FREE_AND_NULL(pathspec->items);
        pathspec->nr = 0;
 }