undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tb/show-ref-optim'

Browse Source 
"git show-ref --heads" (and "--tags") still iterated over all the
refs only to discard refs outside the specified area, which has
been corrected.

* tb/show-ref-optim:
  builtin/show-ref.c: avoid over-iterating with --heads, --tags
This commit is contained in:
Junio C Hamano 2022-06-13 15:53:42 -07:00
commit 2246937e41
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/show-ref.c
View File

@ -52,14 +52,6 @@ static int show_ref(const char *refname, const struct object_id *oid,
if (show_head && !strcmp(refname, "HEAD")) if (show_head && !strcmp(refname, "HEAD"))
goto match; goto match;
if (tags_only || heads_only) {
int match;
match = heads_only && starts_with(refname, "refs/heads/");
match |= tags_only && starts_with(refname, "refs/tags/");
if (!match)
return 0;
}
if (pattern) { if (pattern) {
int reflen = strlen(refname); int reflen = strlen(refname);
const char **p = pattern, *m; const char **p = pattern, *m;
@ -216,7 +208,14 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
if (show_head) if (show_head)
head_ref(show_ref, NULL); head_ref(show_ref, NULL);
for_each_ref(show_ref, NULL); if (heads_only || tags_only) {
if (heads_only)
for_each_fullref_in("refs/heads/", show_ref, NULL);
if (tags_only)
for_each_fullref_in("refs/tags/", show_ref, NULL);
} else {
for_each_ref(show_ref, NULL);
}
if (!found_match) { if (!found_match) {
if (verify && !quiet) if (verify && !quiet)
die("No match"); die("No match");