From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 May 2016 22:12:25 GMT
Subject: Re: [PATCH v6 00/17] Port branch.c to use ref-filter's printing options
Message-ID: <xmqq4m9x1wl2.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1463309133-14503-1-git-send-email-Karthik.188@gmail.com>

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?

> Changes in this version:
>
> 1. Rebased on top of f307218 (t6302: simplify non-gpg cases).

Huh?

  $ 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".