provide --color option for all ref-filter users

[thirdparty/git.git] / tree-diff.c

diff --git a/tree-diff.c b/tree-diff.c
index 467e3817243567dadfaf853fddef8a0ef894f270..bd6d65a40920a547b9f27512e31341231273fa75 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -141,8 +141,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,
        /* if last->next is !NULL - it is a pre-allocated memory, we can reuse */
        p = last->next;
        if (p && (alloclen > (intptr_t)p->next)) {
-               free(p);
-               p = NULL;
+               FREE_AND_NULL(p);
        }
 
        if (!p) {
@@ -559,8 +558,7 @@ struct combine_diff_path *diff_tree_paths(
         * (see path_appendnew() for details about why)
         */
        if (p->next) {
-               free(p->next);
-               p->next = NULL;
+               FREE_AND_NULL(p->next);
        }
 
        return p;