From: Junio C Hamano Date: Mon, 26 Oct 2015 22:55:22 +0000 (-0700) Subject: Merge branch 'kn/for-each-tag' X-Git-Tag: v2.7.0-rc0~76 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2be421dbb6928421350fff407544ec34e68c1f73?hp=-c Merge branch 'kn/for-each-tag' Recent update to "git tag --contains" caused a performance regression. * kn/for-each-tag: tag.c: use the correct algorithm for the '--contains' option --- 2be421dbb6928421350fff407544ec34e68c1f73 diff --combined builtin/tag.c index 566078773f,42554d81c3..8db8c87e57 --- a/builtin/tag.c +++ b/builtin/tag.c @@@ -52,6 -52,7 +52,7 @@@ static int list_tags(struct ref_filter } verify_ref_format(format); + filter->with_commit_tag_algo = 1; filter_refs(&array, filter, FILTER_REFS_TAGS); ref_array_sort(sorting, &array); @@@ -268,7 -269,7 +269,7 @@@ static void create_tag(const unsigned c } if (opt->cleanup_mode != CLEANUP_NONE) - stripspace(buf, opt->cleanup_mode == CLEANUP_ALL); + strbuf_stripspace(buf, opt->cleanup_mode == CLEANUP_ALL); if (!opt->message_given && !buf->len) die(_("no tag message?")); @@@ -354,7 -355,7 +355,7 @@@ int cmd_tag(int argc, const char **argv OPT_STRING('u', "local-user", &keyid, N_("key-id"), N_("use another key to sign the tag")), OPT__FORCE(&force, N_("replace the tag if exists")), - OPT_BOOL(0, "create-reflog", &create_reflog, N_("create_reflog")), + OPT_BOOL(0, "create-reflog", &create_reflog, N_("create a reflog")), OPT_GROUP(N_("Tag listing options")), OPT_COLUMN(0, "column", &colopts, N_("show tag list in columns")),