@matheusbsbs / matheus-bagliano / commits / 2ac5e4470b

revision: mark contents of an uninteresting tree uninteresting

"git rev-list --objects ^A^{tree} B^{tree}" ought to mean "I want a list of objects inside B's tree, but please exclude the objects that appear inside A's tree". we see the top-level tree marked as uninteresting (i.e. ^A^{tree} in the above example) and call mark_tree_uninteresting() on it; this unfortunately prevents us from recursing into the tree and marking the objects in the tree as uninteresting. The reason why "git log ^A A" yields an empty set of commits, i.e. we do not have a similar issue for commits, is because we call mark_parents_uninteresting() after seeing an uninteresting commit. The uninteresting-ness of the commit itself does not prevent its parents from being marked as uninteresting. Introduce mark_tree_contents_uninteresting() and structure the code in handle_commit() in such a way that it makes it the responsibility of the callchain leading to this function to mark commits, trees and blobs as uninteresting, and also make it the responsibility of the helpers called from this function to mark objects that are reachable from them. Note that this is a very old bug that probably dates back to the day when "rev-list --objects" was introduced. The line to clear tree->object.parsed at the end of mark_tree_contents_uninteresting() can be removed when this fix is merged to the codebase after 6e454b9a (clear parsed flag when we free tree buffers, 2013-06-05). Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jan 15, 2014 at 15:38 UTC 2ac5e4470b7a17303b10ba539d8aa84e870bade9

2 files changed +23 -8

revision.c

+17 -8

@@ -98,17 +98,12 @@ static void mark_blob_uninteresting(struct blob *blob)

98 blob->object.flags |= UNINTERESTING;

99 }

100

101 -void mark_tree_uninteresting(struct tree *tree)

101 +static void mark_tree_contents_uninteresting(struct tree *tree)

102 {

103 struct tree_desc desc;

104 struct name_entry entry;

105 struct object *obj = &tree->object;

106

107 - if (!tree)

108 - return;

109 - if (obj->flags & UNINTERESTING)

110 - return;

111 - obj->flags |= UNINTERESTING;

107 if (!has_sha1_file(obj->sha1))

108 return;

109 if (parse_tree(tree) < 0)

@@ -135,6 +130,19 @@ void mark_tree_uninteresting(struct tree *tree)

130 */

131 free(tree->buffer);

132 tree->buffer = NULL;

133 + tree->object.parsed = 0;

134 +}

135 +

136 +void mark_tree_uninteresting(struct tree *tree)

137 +{

138 + struct object *obj = &tree->object;

139 +

140 + if (!tree)

141 + return;

142 + if (obj->flags & UNINTERESTING)

143 + return;

144 + obj->flags |= UNINTERESTING;

145 + mark_tree_contents_uninteresting(tree);

146 }

147

148 void mark_parents_uninteresting(struct commit *commit)

@@ -294,7 +302,8 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object

302 if (!revs->tree_objects)

303 return NULL;

304 if (flags & UNINTERESTING) {

297 - mark_tree_uninteresting(tree);

305 + tree->object.flags |= UNINTERESTING;

306 + mark_tree_contents_uninteresting(tree);

307 return NULL;

308 }

309 add_pending_object(revs, object, "");

@@ -309,7 +318,7 @@ static struct commit *handle_commit(struct rev_info *revs, struct object *object

318 if (!revs->blob_objects)

319 return NULL;

320 if (flags & UNINTERESTING) {

312 - mark_blob_uninteresting(blob);

321 + blob->object.flags |= UNINTERESTING;

322 return NULL;

323 }

324 add_pending_object(revs, object, "");

t/t6000-rev-list-misc.sh

@@ -56,4 +56,10 @@ test_expect_success 'rev-list A..B and rev-list ^A B are the same' '

56 test_cmp expect actual

57 '

59 +test_expect_success 'propagate uninteresting flag down correctly' '

60 + git rev-list --objects ^HEAD^{tree} HEAD^{tree} >actual &&

61 + >expect &&

62 + test_cmp expect actual

63 +'

64 +

65 test_done