{"thread":{"id":"56543","subject":"[PATCH 0/4] ref-filter: fix %(symref) for pretty_print_ref()","startedAt":"2021-09-20T07:38:01Z","lastAt":"2021-09-20T07:38:07Z","messageCount":5,"participants":["ZheNing Hu via GitGitGadget"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"436397","messageId":"pull.1042.git.1632123476.gitgitgadget@gmail.com","threadId":"56543","inReplyTo":null,"subject":"[PATCH 0/4] ref-filter: fix %(symref) for pretty_print_ref()","fromName":"ZheNing Hu via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-09-20T07:37:52Z","receivedAt":"2021-09-20T07:38:01Z","isPatch":true,"sender":{"key":"adlternative@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58138461?v=4"},"body":"Because pretty_print_ref() currently has no ref_item flag, but the\nimplementation of %(symref) need this flag, so git tag --verify or git\nverify-tag cannot get the output of %(symref). Therefore, %(symref) will be\nfixed in this patch series.\n\nThis bug was discovered by Peff here:\nhttps://lore.kernel.org/git/YUO63qy2%2F5wibY4%2F@coredump.intra.peff.net/\n\non the other hand, git tag --verify --format=\"%(refname)\" or git verify-tag\n--forrmat=\"%(refname)\" does not show the fullref name, but seems to be\nsimilar to using %(refname:lstrip=2).\n\nAnd git verify-tag --format=\"verify: %(refname)\" c06b72d02` will output:\n\"verify: c06b72d02\". They are wrong features, but because some scripts are\nusing them, so our current approach is to keep them.\n\nZheNing Hu (4):\n  refs: let repo_dwim_ref() learn get symref itself and ref flags\n  ref-filter: provide ref_flags to pretty_print_ref()\n  verify_tag: use repo_dwim_ref() to get ref fullname and ref_flags\n  ref-filter: let tag verify use %(refname:lstrip=2) by default\n\n builtin/tag.c         | 16 ++++++++-------\n builtin/verify-tag.c  |  9 ++++++++-\n object-name.c         |  6 +++---\n ref-filter.c          | 47 +++++++++++++++++++++++++++++++++----------\n ref-filter.h          |  4 +++-\n refs.c                | 15 +++++++++-----\n refs.h                |  8 +++++---\n t/t7030-verify-tag.sh | 23 +++++++++++++++++++++\n upload-pack.c         |  2 +-\n 9 files changed, 98 insertions(+), 32 deletions(-)\n\n\nbase-commit: 8b7c11b8668b4e774f81a9f0b4c30144b818f1d1\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1042%2Fadlternative%2Fpretty-print-ref-symref-fix-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1042/adlternative/pretty-print-ref-symref-fix-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1042\n-- \ngitgitgadget\n"},{"id":"436398","messageId":"22b69757e33d310e78232dbe520a1995486ec918.1632123476.git.gitgitgadget@gmail.com","threadId":"56543","inReplyTo":"pull.1042.git.1632123476.gitgitgadget@gmail.com","subject":"[PATCH 1/4] refs: let repo_dwim_ref() learn get symref itself and ref flags","fromName":"ZheNing Hu via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-09-20T07:37:53Z","receivedAt":"2021-09-20T07:38:02Z","isPatch":true,"sender":{"key":"adlternative@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58138461?v=4"},"body":"From: ZheNing Hu <adlternative@gmail.com>\n\nexpand_ref() can use to resolve a ref to its fullname, A symref will\nalso be resolved to the fullref name it refers to. But sometimes we\nwant get symref itself. So add a need_symref parameter to\nrepo_dwim_ref() and expand_ref(), which can help us get symref its\nfullref name. At the same time, we add ref_flags parameter to\nexpand_ref() and repo_dwim_ref(), when it is set, it can get the\nref's flag from refs_resolve_ref_unsafe(), which can help us provide\nref's flags for interfaces like pretty_print_ref() later.\n\nSigned-off-by: ZheNing Hu <adlternative@gmail.com>\n---\n object-name.c |  6 +++---\n refs.c        | 15 ++++++++++-----\n refs.h        |  8 +++++---\n upload-pack.c |  2 +-\n 4 files changed, 19 insertions(+), 12 deletions(-)\n\ndiff --git a/object-name.c b/object-name.c\nindex fdff4601b2c..a8cb1d6ab14 100644\n--- a/object-name.c\n+++ b/object-name.c\n@@ -803,7 +803,7 @@ static int get_oid_basic(struct repository *r, const char *str, int len,\n \n \tif (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) {\n \t\tif (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {\n-\t\t\trefs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0);\n+\t\t\trefs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0, 0, 0);\n \t\t\tif (refs_found > 0) {\n \t\t\t\twarning(warn_msg, len, str);\n \t\t\t\tif (advice_enabled(ADVICE_OBJECT_NAME_WARNING))\n@@ -854,11 +854,11 @@ static int get_oid_basic(struct repository *r, const char *str, int len,\n \n \tif (!len && reflog_len)\n \t\t/* allow \"@{...}\" to mean the current branch reflog */\n-\t\trefs_found = repo_dwim_ref(r, \"HEAD\", 4, oid, &real_ref, 0);\n+\t\trefs_found = repo_dwim_ref(r, \"HEAD\", 4, oid, &real_ref, 0, 0, 0);\n \telse if (reflog_len)\n \t\trefs_found = repo_dwim_log(r, str, len, oid, &real_ref);\n \telse\n-\t\trefs_found = repo_dwim_ref(r, str, len, oid, &real_ref, 0);\n+\t\trefs_found = repo_dwim_ref(r, str, len, oid, &real_ref, 0, 0, 0);\n \n \tif (!refs_found)\n \t\treturn -1;\ndiff --git a/refs.c b/refs.c\nindex 8b9f7c3a80a..67618a09992 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -637,17 +637,19 @@ static char *substitute_branch_name(struct repository *r,\n }\n \n int repo_dwim_ref(struct repository *r, const char *str, int len,\n-\t\t  struct object_id *oid, char **ref, int nonfatal_dangling_mark)\n+\t\t  struct object_id *oid, char **ref, int nonfatal_dangling_mark,\n+\t\t  int *ref_flags, int need_symref)\n {\n \tchar *last_branch = substitute_branch_name(r, &str, &len,\n \t\t\t\t\t\t   nonfatal_dangling_mark);\n-\tint   refs_found  = expand_ref(r, str, len, oid, ref);\n+\tint   refs_found  = expand_ref(r, str, len, oid, ref, ref_flags, need_symref);\n \tfree(last_branch);\n \treturn refs_found;\n }\n \n int expand_ref(struct repository *repo, const char *str, int len,\n-\t       struct object_id *oid, char **ref)\n+\t       struct object_id *oid, char **ref, int *ref_flags,\n+\t       int need_symref)\n {\n \tconst char **p, *r;\n \tint refs_found = 0;\n@@ -666,8 +668,11 @@ int expand_ref(struct repository *repo, const char *str, int len,\n \t\t\t\t\t    fullref.buf, RESOLVE_REF_READING,\n \t\t\t\t\t    this_result, &flag);\n \t\tif (r) {\n-\t\t\tif (!refs_found++)\n-\t\t\t\t*ref = xstrdup(r);\n+\t\t\tif (!refs_found++) {\n+\t\t\t\t*ref = xstrdup(need_symref ? fullref.buf : r);\n+\t\t\t\tif (ref_flags)\n+\t\t\t\t\t*ref_flags = flag;\n+\t\t\t}\n \t\t\tif (!warn_ambiguous_refs)\n \t\t\t\tbreak;\n \t\t} else if ((flag & REF_ISSYMREF) && strcmp(fullref.buf, \"HEAD\")) {\ndiff --git a/refs.h b/refs.h\nindex 48970dfc7e0..1f977bdb188 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -152,15 +152,17 @@ int refname_match(const char *abbrev_name, const char *full_name);\n struct strvec;\n void expand_ref_prefix(struct strvec *prefixes, const char *prefix);\n \n-int expand_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);\n+int expand_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref,\n+\t       int *ref_flags, int need_symref);\n int repo_dwim_ref(struct repository *r, const char *str, int len,\n-\t\t  struct object_id *oid, char **ref, int nonfatal_dangling_mark);\n+\t\t  struct object_id *oid, char **ref, int nonfatal_dangling_mark,\n+\t\t  int *ref_flags, int need_symref);\n int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);\n static inline int dwim_ref(const char *str, int len, struct object_id *oid,\n \t\t\t   char **ref, int nonfatal_dangling_mark)\n {\n \treturn repo_dwim_ref(the_repository, str, len, oid, ref,\n-\t\t\t     nonfatal_dangling_mark);\n+\t\t\t     nonfatal_dangling_mark, 0, 0);\n }\n int dwim_log(const char *str, int len, struct object_id *oid, char **ref);\n \ndiff --git a/upload-pack.c b/upload-pack.c\nindex 6ce07231d3d..dfbdd6d9466 100644\n--- a/upload-pack.c\n+++ b/upload-pack.c\n@@ -975,7 +975,7 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,\n \tif (skip_prefix(line, \"deepen-not \", &arg)) {\n \t\tchar *ref = NULL;\n \t\tstruct object_id oid;\n-\t\tif (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)\n+\t\tif (expand_ref(the_repository, arg, strlen(arg), &oid, &ref, 0, 0) != 1)\n \t\t\tdie(\"git upload-pack: ambiguous deepen-not: %s\", line);\n \t\tstring_list_append(deepen_not, ref);\n \t\tfree(ref);\n-- \ngitgitgadget\n\n"},{"id":"436399","messageId":"6f49635819aadad473dffc689ef1da7754d4ba63.1632123476.git.gitgitgadget@gmail.com","threadId":"56543","inReplyTo":"pull.1042.git.1632123476.gitgitgadget@gmail.com","subject":"[PATCH 2/4] ref-filter: provide ref_flags to pretty_print_ref()","fromName":"ZheNing Hu via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-09-20T07:37:54Z","receivedAt":"2021-09-20T07:38:02Z","isPatch":true,"sender":{"key":"adlternative@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58138461?v=4"},"body":"From: ZheNing Hu <adlternative@gmail.com>\n\npretty_print_ref() creates a ref_item through new_ref_array_item(),\nbut such ref_item does not set its flag member, this means that %(symref)\nwill not be processed in populate_value().\n\nSo provide ref_flags parameter to pretty_print_ref() and verify_tag().\npretty_print_ref() has two callers: cmd_verify_tag(), verify_tag(),\nlet for_each_tag_name() use read_ref_full() instread of read_ref() to\ngenerate the ref_flags and pass to pretty_print_ref(); However,\ncmd_verify_tag() needs to be modified later to support providing ref_flags\nto pretty_print_ref().\n\nAt the same time, let verify_tag() pass \"ref\" instread of \"name\" to\ngpg_verify_tag() and pretty_print_ref(), which can help pretty_print_ref\nget fullref name.\n\nSigned-off-by: ZheNing Hu <adlternative@gmail.com>\n---\n builtin/tag.c        | 15 ++++++++-------\n builtin/verify-tag.c |  2 +-\n ref-filter.c         |  3 ++-\n ref-filter.h         |  2 +-\n 4 files changed, 12 insertions(+), 10 deletions(-)\n\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex 065b6bf093e..ce5678d179f 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -83,7 +83,7 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting,\n }\n \n typedef int (*each_tag_name_fn)(const char *name, const char *ref,\n-\t\t\t\tconst struct object_id *oid, void *cb_data);\n+\t\t\t\tconst struct object_id *oid, void *cb_data, int ref_flags);\n \n static int for_each_tag_name(const char **argv, each_tag_name_fn fn,\n \t\t\t     void *cb_data)\n@@ -92,16 +92,17 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn,\n \tstruct strbuf ref = STRBUF_INIT;\n \tint had_error = 0;\n \tstruct object_id oid;\n+\tint ref_flags;\n \n \tfor (p = argv; *p; p++) {\n \t\tstrbuf_reset(&ref);\n \t\tstrbuf_addf(&ref, \"refs/tags/%s\", *p);\n-\t\tif (read_ref(ref.buf, &oid)) {\n+\t\tif (read_ref_full(ref.buf, RESOLVE_REF_READING, &oid, &ref_flags)) {\n \t\t\terror(_(\"tag '%s' not found.\"), *p);\n \t\t\thad_error = 1;\n \t\t\tcontinue;\n \t\t}\n-\t\tif (fn(*p, ref.buf, &oid, cb_data))\n+\t\tif (fn(*p, ref.buf, &oid, cb_data, ref_flags))\n \t\t\thad_error = 1;\n \t}\n \tstrbuf_release(&ref);\n@@ -109,7 +110,7 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn,\n }\n \n static int collect_tags(const char *name, const char *ref,\n-\t\t\tconst struct object_id *oid, void *cb_data)\n+\t\t\tconst struct object_id *oid, void *cb_data, int unused_flags)\n {\n \tstruct string_list *ref_list = cb_data;\n \n@@ -143,7 +144,7 @@ static int delete_tags(const char **argv)\n }\n \n static int verify_tag(const char *name, const char *ref,\n-\t\t      const struct object_id *oid, void *cb_data)\n+\t\t      const struct object_id *oid, void *cb_data, int ref_flags)\n {\n \tint flags;\n \tstruct ref_format *format = cb_data;\n@@ -152,11 +153,11 @@ static int verify_tag(const char *name, const char *ref,\n \tif (format->format)\n \t\tflags = GPG_VERIFY_OMIT_STATUS;\n \n-\tif (gpg_verify_tag(oid, name, flags))\n+\tif (gpg_verify_tag(oid, ref, flags))\n \t\treturn -1;\n \n \tif (format->format)\n-\t\tpretty_print_ref(name, oid, format);\n+\t\tpretty_print_ref(ref, oid, format, ref_flags);\n \n \treturn 0;\n }\ndiff --git a/builtin/verify-tag.c b/builtin/verify-tag.c\nindex f45136a06ba..403f2080efa 100644\n--- a/builtin/verify-tag.c\n+++ b/builtin/verify-tag.c\n@@ -71,7 +71,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \t\t}\n \n \t\tif (format.format)\n-\t\t\tpretty_print_ref(name, &oid, &format);\n+\t\t\tpretty_print_ref(name, &oid, &format, 0);\n \t}\n \treturn had_error;\n }\ndiff --git a/ref-filter.c b/ref-filter.c\nindex 93ce2a6ef2e..6c51ef25136 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -2632,7 +2632,7 @@ int format_ref_array_item(struct ref_array_item *info,\n }\n \n void pretty_print_ref(const char *name, const struct object_id *oid,\n-\t\t      struct ref_format *format)\n+\t\t      struct ref_format *format, int ref_flags)\n {\n \tstruct ref_array_item *ref_item;\n \tstruct strbuf output = STRBUF_INIT;\n@@ -2640,6 +2640,7 @@ void pretty_print_ref(const char *name, const struct object_id *oid,\n \n \tref_item = new_ref_array_item(name, oid);\n \tref_item->kind = ref_kind_from_refname(name);\n+\tref_item->flag = ref_flags;\n \tif (format_ref_array_item(ref_item, format, &output, &err))\n \t\tdie(\"%s\", err.buf);\n \tfwrite(output.buf, 1, output.len, stdout);\ndiff --git a/ref-filter.h b/ref-filter.h\nindex c15dee8d6b9..edd9a3b6652 100644\n--- a/ref-filter.h\n+++ b/ref-filter.h\n@@ -140,7 +140,7 @@ void setup_ref_filter_porcelain_msg(void);\n  * name must be a fully qualified refname.\n  */\n void pretty_print_ref(const char *name, const struct object_id *oid,\n-\t\t      struct ref_format *format);\n+\t\t      struct ref_format *format, int ref_flags);\n \n /*\n  * Push a single ref onto the array; this can be used to construct your own\n-- \ngitgitgadget\n\n"},{"id":"436400","messageId":"4f2f3fc4be468bbde953bd0135e59cd7a36f107f.1632123476.git.gitgitgadget@gmail.com","threadId":"56543","inReplyTo":"pull.1042.git.1632123476.gitgitgadget@gmail.com","subject":"[PATCH 3/4] verify_tag: use repo_dwim_ref() to get ref fullname and ref_flags","fromName":"ZheNing Hu via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-09-20T07:37:55Z","receivedAt":"2021-09-20T07:38:04Z","isPatch":true,"sender":{"key":"adlternative@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58138461?v=4"},"body":"From: ZheNing Hu <adlternative@gmail.com>\n\nSince verify-tag cannot currently use %(symref) correctly, we need\nto get the ref flags from pretty_print_ref() caller. So use\nrepo_dwim_ref() in cmd_verify_tag() to get fullref name and ref flags\nand pass to pretty_print_ref(), which can help us fix %(symref)\nfeature.\n\nSigned-off-by: ZheNing Hu <adlternative@gmail.com>\n---\n builtin/verify-tag.c | 6 +++++-\n 1 file changed, 5 insertions(+), 1 deletion(-)\n\ndiff --git a/builtin/verify-tag.c b/builtin/verify-tag.c\nindex 403f2080efa..efc8282782a 100644\n--- a/builtin/verify-tag.c\n+++ b/builtin/verify-tag.c\n@@ -59,6 +59,8 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \twhile (i < argc) {\n \t\tstruct object_id oid;\n \t\tconst char *name = argv[i++];\n+\t\tchar *refname;\n+\t\tint ref_flags;\n \n \t\tif (get_oid(name, &oid)) {\n \t\t\thad_error = !!error(\"tag '%s' not found.\", name);\n@@ -70,8 +72,10 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \t\t\tcontinue;\n \t\t}\n \n+\t\tif (repo_dwim_ref(the_repository, name, strlen(name), &oid, &refname, 0, &ref_flags, 1))\n+\t\t\tname = refname;\n \t\tif (format.format)\n-\t\t\tpretty_print_ref(name, &oid, &format, 0);\n+\t\t\tpretty_print_ref(name, &oid, &format, ref_flags);\n \t}\n \treturn had_error;\n }\n-- \ngitgitgadget\n\n"},{"id":"436401","messageId":"d4e77765a8f5478c360fe78e72eb556ecdc326a5.1632123476.git.gitgitgadget@gmail.com","threadId":"56543","inReplyTo":"pull.1042.git.1632123476.gitgitgadget@gmail.com","subject":"[PATCH 4/4] ref-filter: let tag verify use %(refname:lstrip=2) by default","fromName":"ZheNing Hu via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2021-09-20T07:37:56Z","receivedAt":"2021-09-20T07:38:07Z","isPatch":true,"sender":{"key":"adlternative@gmail.com","avatar":"https://avatars.githubusercontent.com/u/58138461?v=4"},"body":"From: ZheNing Hu <adlternative@gmail.com>\n\nBecause git verify-tag or git tag --verify are using command line\nparameters we pass as the %(refname) output (e.g. `git verify-tag\n--format=\"verify: %(refname)\" c06b72d02` will output\n\"verify: c06b72d02\"). This is an design error, but it is widely\nused by some scripts.\n\nAfter we fix the bug that git verify_tag and git tag --verify\ncannot use %(symref) correctly, we still need to make %(refname)\nkeep the same output as in the past. So add special_tag_verify to\nref_array_item and ref_format, when this flag is setted and we\nare using refname atom default output formats such as %(refname),\n%(symref), modify the attribute of the atom corresponding to\n%(refname) in get_refname() and get_symref() and\nfill_remote_ref_details(), which let show_ref() output something\nlike %(refname:lstrip=2). After show_ref() completes, restore the\natom attribute as their origin state.\n\nWe can set special_tag_verify flag directly in tag.c, but in\nverify_tag.c, if we didn't get a refname from repo_dwim_ref(), we\ndon’t need to set special_tag_verify of ref_format and change its\noutput form, otherwise, set it.\n\nSigned-off-by: ZheNing Hu <adlternative@gmail.com>\n---\n builtin/tag.c         |  1 +\n builtin/verify-tag.c  |  5 ++++-\n ref-filter.c          | 44 +++++++++++++++++++++++++++++++++----------\n ref-filter.h          |  2 ++\n t/t7030-verify-tag.sh | 23 ++++++++++++++++++++++\n 5 files changed, 64 insertions(+), 11 deletions(-)\n\ndiff --git a/builtin/tag.c b/builtin/tag.c\nindex ce5678d179f..bf2acb9f832 100644\n--- a/builtin/tag.c\n+++ b/builtin/tag.c\n@@ -149,6 +149,7 @@ static int verify_tag(const char *name, const char *ref,\n \tint flags;\n \tstruct ref_format *format = cb_data;\n \tflags = GPG_VERIFY_VERBOSE;\n+\tformat->special_tag_verify = 1;\n \n \tif (format->format)\n \t\tflags = GPG_VERIFY_OMIT_STATUS;\ndiff --git a/builtin/verify-tag.c b/builtin/verify-tag.c\nindex efc8282782a..dd2ff94eac9 100644\n--- a/builtin/verify-tag.c\n+++ b/builtin/verify-tag.c\n@@ -61,6 +61,7 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \t\tconst char *name = argv[i++];\n \t\tchar *refname;\n \t\tint ref_flags;\n+\t\tformat.special_tag_verify = 0;\n \n \t\tif (get_oid(name, &oid)) {\n \t\t\thad_error = !!error(\"tag '%s' not found.\", name);\n@@ -72,8 +73,10 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)\n \t\t\tcontinue;\n \t\t}\n \n-\t\tif (repo_dwim_ref(the_repository, name, strlen(name), &oid, &refname, 0, &ref_flags, 1))\n+\t\tif (repo_dwim_ref(the_repository, name, strlen(name), &oid, &refname, 0, &ref_flags, 1)) {\n \t\t\tname = refname;\n+\t\t\tformat.special_tag_verify = 1;\n+\t\t}\n \t\tif (format.format)\n \t\t\tpretty_print_ref(name, &oid, &format, ref_flags);\n \t}\ndiff --git a/ref-filter.c b/ref-filter.c\nindex 6c51ef25136..c7c3182ab5b 100644\n--- a/ref-filter.c\n+++ b/ref-filter.c\n@@ -1640,12 +1640,19 @@ static const char *show_ref(struct refname_atom *atom, const char *refname)\n }\n \n static void fill_remote_ref_details(struct used_atom *atom, const char *refname,\n-\t\t\t\t    struct branch *branch, const char **s)\n+\t\t\t\t    struct branch *branch, const char **s, struct ref_array_item *ref)\n {\n \tint num_ours, num_theirs;\n-\tif (atom->u.remote_ref.option == RR_REF)\n-\t\t*s = show_ref(&atom->u.remote_ref.refname, refname);\n-\telse if (atom->u.remote_ref.option == RR_TRACK) {\n+\tif (atom->u.remote_ref.option == RR_REF) {\n+\t\tif (ref->special_tag_verify && atom->u.remote_ref.refname.option == R_NORMAL) {\n+\t\t\tatom->u.remote_ref.refname.option = R_LSTRIP;\n+\t\t\tatom->u.remote_ref.refname.lstrip = 2;\n+\t\t\t*s = show_ref(&atom->u.remote_ref.refname, refname);\n+\t\t\tatom->u.remote_ref.refname.option = R_NORMAL;\n+\t\t} else {\n+\t\t\t*s = show_ref(&atom->u.remote_ref.refname, refname);\n+\t\t}\n+\t} else if (atom->u.remote_ref.option == RR_TRACK) {\n \t\tif (stat_tracking_info(branch, &num_ours, &num_theirs,\n \t\t\t\t       NULL, atom->u.remote_ref.push,\n \t\t\t\t       AHEAD_BEHIND_FULL) < 0) {\n@@ -1726,17 +1733,33 @@ char *get_head_description(void)\n \n static const char *get_symref(struct used_atom *atom, struct ref_array_item *ref)\n {\n-\tif (!ref->symref)\n+\tif (!ref->symref) {\n \t\treturn xstrdup(\"\");\n-\telse\n+\t} else if (ref->special_tag_verify && atom->u.refname.option == R_NORMAL) {\n+\t\tatom->u.refname.option = R_LSTRIP;\n+\t\tatom->u.refname.lstrip = 2;\n+\t\treturn show_ref(&atom->u.refname, ref->symref);\n+\t\tatom->u.refname.option = R_NORMAL;\n+\t} else {\n \t\treturn show_ref(&atom->u.refname, ref->symref);\n+\t}\n }\n \n static const char *get_refname(struct used_atom *atom, struct ref_array_item *ref)\n {\n-\tif (ref->kind & FILTER_REFS_DETACHED_HEAD)\n+\tif (ref->kind & FILTER_REFS_DETACHED_HEAD) {\n \t\treturn get_head_description();\n-\treturn show_ref(&atom->u.refname, ref->refname);\n+\t} else if (ref->special_tag_verify && atom->u.refname.option == R_NORMAL) {\n+\t\tconst char * refname;\n+\n+\t\tatom->u.refname.option = R_LSTRIP;\n+\t\tatom->u.refname.lstrip = 2;\n+\t\trefname = show_ref(&atom->u.refname, ref->refname);\n+\t\tatom->u.refname.option = R_NORMAL;\n+\t\treturn refname;\n+\t} else {\n+\t\treturn show_ref(&atom->u.refname, ref->refname);\n+\t}\n }\n \n static int get_object(struct ref_array_item *ref, int deref, struct object **obj,\n@@ -1878,7 +1901,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)\n \n \t\t\trefname = branch_get_upstream(branch, NULL);\n \t\t\tif (refname)\n-\t\t\t\tfill_remote_ref_details(atom, refname, branch, &v->s);\n+\t\t\t\tfill_remote_ref_details(atom, refname, branch, &v->s, ref);\n \t\t\telse\n \t\t\t\tv->s = xstrdup(\"\");\n \t\t\tcontinue;\n@@ -1899,7 +1922,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)\n \t\t\t}\n \t\t\t/* We will definitely re-init v->s on the next line. */\n \t\t\tfree((char *)v->s);\n-\t\t\tfill_remote_ref_details(atom, refname, branch, &v->s);\n+\t\t\tfill_remote_ref_details(atom, refname, branch, &v->s, ref);\n \t\t\tcontinue;\n \t\t} else if (atom_type == ATOM_COLOR) {\n \t\t\tv->s = xstrdup(atom->u.color);\n@@ -2641,6 +2664,7 @@ void pretty_print_ref(const char *name, const struct object_id *oid,\n \tref_item = new_ref_array_item(name, oid);\n \tref_item->kind = ref_kind_from_refname(name);\n \tref_item->flag = ref_flags;\n+\tref_item->special_tag_verify = format->special_tag_verify;\n \tif (format_ref_array_item(ref_item, format, &output, &err))\n \t\tdie(\"%s\", err.buf);\n \tfwrite(output.buf, 1, output.len, stdout);\ndiff --git a/ref-filter.h b/ref-filter.h\nindex edd9a3b6652..63c8d24a6fc 100644\n--- a/ref-filter.h\n+++ b/ref-filter.h\n@@ -42,6 +42,7 @@ struct ref_array_item {\n \tint flag;\n \tunsigned int kind;\n \tconst char *symref;\n+\tint special_tag_verify;\n \tstruct commit *commit;\n \tstruct atom_value *value;\n \tchar refname[FLEX_ARRAY];\n@@ -84,6 +85,7 @@ struct ref_format {\n \n \t/* Internal state to ref-filter */\n \tint need_color_reset_at_eol;\n+\tint special_tag_verify;\n };\n \n #define REF_FORMAT_INIT { .use_color = -1 }\ndiff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh\nindex 10faa645157..85e2a653ed8 100755\n--- a/t/t7030-verify-tag.sh\n+++ b/t/t7030-verify-tag.sh\n@@ -194,6 +194,29 @@ test_expect_success GPG 'verifying tag with --format' '\n \ttest_cmp expect actual\n '\n \n+test_expect_success GPG 'verifying tag with --format=\"%(refname) %(symref)\"' '\n+\tgit tag -s -m bar annotated &&\n+\tgit symbolic-ref refs/tags/symref refs/tags/annotated &&\n+\tsha=$(git rev-parse symref) &&\n+\tSP=\" \" &&\n+\tcat >expect <<-EOF &&\n+\tverify: annotated$SP\n+\tverify: symref annotated\n+\tverify: $sha$SP\n+\tEOF\n+\tgit verify-tag --format=\"verify: %(refname) %(symref)\" annotated symref $sha >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success GPG 'tag verify with --format=\"%(refname) %(symref)\"' '\n+\tcat >expect <<-EOF &&\n+\tverify: annotated$SP\n+\tverify: symref annotated\n+\tEOF\n+\tgit tag --verify --format=\"verify: %(refname) %(symref)\" annotated symref >actual &&\n+\ttest_cmp expect actual\n+'\n+\n test_expect_success GPG 'verifying tag with --format=\"%(rest)\" must fail' '\n \ttest_must_fail git verify-tag --format=\"%(rest)\" \"fourth-signed\"\n '\n-- \ngitgitgadget\n"}]}