Merge branch 'maint' of git://github.com/git-l10n/git-po

diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index af2fcb2c1217bc89e095515f6dcfcfb1c0e2befa..76bb723c8674c3022b271c93b587d941c8e6d397 100644 (file)
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -82,9 +82,8 @@ static void clear_ref_dir(struct ref_dir *dir)
        int i;
        for (i = 0; i < dir->nr; i++)
                free_ref_entry(dir->entries[i]);
-       free(dir->entries);
+       FREE_AND_NULL(dir->entries);
        dir->sorted = dir->nr = dir->alloc = 0;
-       dir->entries = NULL;
 }
 
 struct ref_entry *create_dir_entry(struct ref_cache *cache,