git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v6 00/17] Port branch.c to use ref-filter's printing options

From
Karthik Nayak <karthik.188@gmail.com>
Date
May 17, 2016, 08:04 UTC
Message-ID
<CAOLa=ZQ5nUazL61eqj34-v06rueyjzvvJHzp8du7HHGi5=7TMA@mail.gmail.com>
In-Reply-To
<xmqq4m9x1wl2.fsf@gitster.mtv.corp.google.com>
On Tue, May 17, 2016 at 3:42 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 13 quoted lines
>
> Karthik Nayak <karthik.188@gmail.com> writes:
>
> > This is part of unification of the commands 'git tag -l, git branch -l
> > and git for-each-ref'. This ports over branch.c to use ref-filter's
> > printing options.
> >
> > Initially posted here: $(gmane/279226). It was decided that this series
> > would follow up after refactoring ref-filter parsing mechanism, which
> > is now merged into master (9606218b32344c5c756f7c29349d3845ef60b80c).
>
> 9606218b?
>
I believe it should be 50cd83dca100174ba95baa9f6ed8426bce731ac2
Show 16 quoted lines
>
> > Changes in this version:
> >
> > 1. Rebased on top of f307218 (t6302: simplify non-gpg cases).
>
>
>   $ git checkout f307218
>   $ git am 0001-ref-filter-implement-if.txt
>   Applying: ref-filter: implement %(if), %(then), and %(else) atoms
>   error: patch failed: Documentation/git-for-each-ref.txt:181
>   error: Documentation/git-for-each-ref.txt: patch does not apply
>   Patch failed at 0001 ref-filter: implement %(if), %(then), and %(else) atoms
>   The copy of the patch that failed is found in: .git/rebase-apply/patch
>   When you have resolved this problem, run "git am --continue".
>   If you prefer to skip this patch, run "git am --skip" instead.
>   To restore the original branch and stop patching, run "git am --abort".

Hello, sorry for the confusion, it's built on top of 'next' which contains f307218 (t6302: simplify non-gpg cases). The merge conflict is due to the commit made by you 1cca17df (Documentation: fix linkgit references).

-- Regards, Karthik

Previous: Junio C HamanoNext: Junio C Hamano
Message 22 of 26 in “Port branch.c to use ref-filter's printing options”
  1. 00/17 Port branch.c to use ref-filter's printing optionsKarthik Nayak, May 15, 2016
  2. 01/17 ref-filter: implement %(if), %(then), and %(else) atomsKarthik Nayak, May 15, 2016
  3. 02/17 ref-filter: include reference to 'used_atom' within 'atom_value'Karthik Nayak, May 15, 2016
  4. 03/17 ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)Karthik Nayak, May 15, 2016
  5. 04/17 ref-filter: modify "%(objectname:short)" to take lengthKarthik Nayak, May 15, 2016
  6. 05/17 ref-filter: move get_head_description() from branch.cKarthik Nayak, May 15, 2016
  7. Junio C HamanoMay 17, 2016
  8. Karthik NayakMay 20, 2016
  9. 06/17 ref-filter: introduce format_ref_array_item()Karthik Nayak, May 15, 2016
  10. 07/17 ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreamsKarthik Nayak, May 15, 2016
  11. 08/17 ref-filter: add support for %(upstream:track,nobracket)Karthik Nayak, May 15, 2016
  12. 09/17 ref-filter: make "%(symref)" atom work with the ':short' modifierKarthik Nayak, May 15, 2016
  13. 10/17 ref-filter: introduce refname_atom_parser_internal()Karthik Nayak, May 15, 2016
  14. 11/17 ref-filter: introduce symref_atom_parser() and refname_atom_parser()Karthik Nayak, May 15, 2016
  15. 12/17 ref-filter: make remote_ref_atom_parser() use refname_atom_parser_internal()Karthik Nayak, May 15, 2016
  16. 13/17 ref-filter: add `:dir` and `:base` options for ref printing atomsKarthik Nayak, May 15, 2016
  17. 14/17 ref-filter: allow porcelain to translate messages in the outputKarthik Nayak, May 15, 2016
  18. 15/17 branch, tag: use porcelain outputKarthik Nayak, May 15, 2016
  19. 16/17 branch: use ref-filter printing APIsKarthik Nayak, May 15, 2016
  20. 17/17 branch: implement '--format' optionKarthik Nayak, May 15, 2016
  21. Junio C HamanoMay 16, 2016
  22. Karthik NayakMay 17, 2016
  23. Junio C HamanoMay 17, 2016
  24. Karthik NayakMay 17, 2016
  25. Junio C HamanoMay 17, 2016
  26. Karthik NayakMay 18, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.