Merge branch 'vb/sendemail' into next

diff --git a/dump-cache-tree.c b/dump-cache-tree.c
index fbea263dd9a37726f7b9e29154d56b26cfe921c2..1ccaf5177318f8765205e192abdffc3336c9aacb 100644 (file)
--- a/dump-cache-tree.c
+++ b/dump-cache-tree.c
@@ -21,10 +21,9 @@ static int dump_cache_tree(struct cache_tree *it,
        int i;
        int errs = 0;
 
-       if (!it)
-               return;
-       if (!ref)
-               die("internal error");
+       if (!it || !ref)
+               /* missing in either */
+               return 0;
 
        if (it->entry_count < 0) {
                dump_one(it, pfx, "");