Merge branch 'jv/pack-objects-narrower-ref-iteration'

gitster · gitster · commit 77db59c2f91d · 2021-02-05T16:40:45.000-08:00
The "pack-objects" command needs to iterate over all the tags when
automatic tag following is enabled, but it actually iterated over
all refs and then discarded everything outside "refs/tags/"
hierarchy, which was quite wasteful.

* jv/pack-objects-narrower-ref-iteration:
  builtin/pack-objects.c: avoid iterating all refs
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -2814,13 +2814,11 @@ static void add_tag_chain(const struct object_id *oid)
 	}
 }
 
-static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data)
+static int add_ref_tag(const char *tag, const struct object_id *oid, int flag, void *cb_data)
 {
 	struct object_id peeled;
 
-	if (starts_with(path, "refs/tags/") && /* is a tag? */
-	    !peel_iterated_oid(oid, &peeled)    && /* peelable? */
-	    obj_is_packed(&peeled)) /* object packed? */
+	if (!peel_iterated_oid(oid, &peeled) && obj_is_packed(&peeled))
 		add_tag_chain(oid);
 	return 0;
 }
@@ -3751,7 +3749,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	}
 	cleanup_preferred_base();
 	if (include_tag && nr_result)
-		for_each_ref(add_ref_tag, NULL);
+		for_each_tag_ref(add_ref_tag, NULL);
 	stop_progress(&progress_state);
 	trace2_region_leave("pack-objects", "enumerate-objects",
 			    the_repository);

Original file line number	Diff line number	Diff line change
`@@ -2814,13 +2814,11 @@ static void add_tag_chain(const struct object_id *oid)`
`2814`	`2814`	`}`
`2815`	`2815`	`}`
`2816`	`2816`
`2817`		`-static int add_ref_tag(const char path, const struct object_id oid, int flag, void *cb_data)`
	`2817`	`+static int add_ref_tag(const char tag, const struct object_id oid, int flag, void *cb_data)`
`2818`	`2818`	`{`
`2819`	`2819`	`struct object_id peeled;`
`2820`	`2820`
`2821`		`- if (starts_with(path, "refs/tags/") && /* is a tag? */`
`2822`		`- !peel_iterated_oid(oid, &peeled) && /* peelable? */`
`2823`		`- obj_is_packed(&peeled)) /* object packed? */`
	`2821`	`+ if (!peel_iterated_oid(oid, &peeled) && obj_is_packed(&peeled))`
`2824`	`2822`	`add_tag_chain(oid);`
`2825`	`2823`	`return 0;`
`2826`	`2824`	`}`
`@@ -3751,7 +3749,7 @@ int cmd_pack_objects(int argc, const char *argv, const char prefix)`
`3751`	`3749`	`}`
`3752`	`3750`	`cleanup_preferred_base();`
`3753`	`3751`	`if (include_tag && nr_result)`
`3754`		`- for_each_ref(add_ref_tag, NULL);`
	`3752`	`+ for_each_tag_ref(add_ref_tag, NULL);`
`3755`	`3753`	`stop_progress(&progress_state);`
`3756`	`3754`	`trace2_region_leave("pack-objects", "enumerate-objects",`
`3757`	`3755`	`the_repository);`