Merge branch 'bw/push-options-recursively-to-submodules' into next

diff --git a/diff-lib.c b/diff-lib.c
index 0c0e20f7c004119cd86bc377722eca6d318cdf5d..2a52b079546cb01d8dfe708f7e7c7e38ec582435 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -179,8 +179,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
                                free(dpath);
                                continue;
                        }
-                       free(dpath);
-                       dpath = NULL;
+                       FREE_AND_NULL(dpath);
 
                        /*
                         * Show the diff for the 'ce' if we found the one