Merge branch 'nd/exclusion-regression-fix' into maint

diff --git a/revision.c b/revision.c
index 2a9463bd670631dcf96ed456ed23e65b7b84f6d4..0a282f533b3e225a996221d614de8bdc960092a3 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -135,10 +135,12 @@ static void mark_tree_contents_uninteresting(struct tree *tree)
 
 void mark_tree_uninteresting(struct tree *tree)
 {
-       struct object *obj = &tree->object;
+       struct object *obj;
 
        if (!tree)
                return;
+
+       obj = &tree->object;
        if (obj->flags & UNINTERESTING)
                return;
        obj->flags |= UNINTERESTING;
@@ -292,9 +294,8 @@ static struct commit *handle_commit(struct rev_info *revs,
                /*
                 * We'll handle the tagged object by looping or dropping
                 * through to the non-tag handlers below. Do not
-                * propagate data from the tag's pending entry.
+                * propagate path data from the tag's pending entry.
                 */
-               name = "";
                path = NULL;
                mode = 0;
        }