mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kn/ref-filter-branch-list'

Browse Source 
The code to list branches in "git branch" has been consolidated
with the more generic ref-filter API.

* kn/ref-filter-branch-list: (21 commits)
  ref-filter: resurrect "strip" as a synonym to "lstrip"
  branch: implement '--format' option
  branch: use ref-filter printing APIs
  branch, tag: use porcelain output
  ref-filter: allow porcelain to translate messages in the output
  ref-filter: add an 'rstrip=<N>' option to atoms which deal with refnames
  ref-filter: modify the 'lstrip=<N>' option to work with negative '<N>'
  ref-filter: Do not abruptly die when using the 'lstrip=<N>' option
  ref-filter: rename the 'strip' option to 'lstrip'
  ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()
  ref-filter: introduce refname_atom_parser()
  ref-filter: introduce refname_atom_parser_internal()
  ref-filter: make "%(symref)" atom work with the ':short' modifier
  ref-filter: add support for %(upstream:track,nobracket)
  ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
  ref-filter: introduce format_ref_array_item()
  ref-filter: move get_head_description() from branch.c
  ref-filter: modify "%(objectname:short)" to take length
  ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
  ref-filter: include reference to 'used_atom' within 'atom_value'
  ...
This commit is contained in:
Junio C Hamano
2017-02-27 13:57:13 -08:00
parent a411726930 44a6b6ce17
commit 93e8cd8b6e
10 changed files with 802 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/tag.c
View File

@ -45,11 +45,11 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, con
if (!format) {
if (filter->lines) {
to_free = xstrfmt("%s %%(contents:lines=%d)",
"%(align:15)%(refname:strip=2)%(end)",
"%(align:15)%(refname:lstrip=2)%(end)",
filter->lines);
format = to_free;
} else
format = "%(refname:strip=2)";
format = "%(refname:lstrip=2)";
}
verify_ref_format(format);
@ -389,6 +389,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
OPT_END()
};
setup_ref_filter_porcelain_msg();
git_config(git_tag_config, sorting_tail);
memset(&opt, 0, sizeof(opt));