From: Junio C Hamano <gitster@pobox.com>
To: Phil Hord <phil.hord@gmail.com>
Cc: peff@peff.net, git@vger.kernel.org,
Jacob Keller <jacob.e.keller@intel.com>
Subject: Re: [PATCH v3 0/2] fetch --prune performance problem
Date: Tue, 01 Jul 2025 18:42:40 -0700 [thread overview]
Message-ID: <xmqqms9nfjvz.fsf@gitster.g> (raw)
In-Reply-To: <20250702005837.2813893-2-phil.hord@gmail.com> (Phil Hord's message of "Tue, 1 Jul 2025 17:58:36 -0700")
Phil Hord <phil.hord@gmail.com> writes:
> This version (V3) has three changes from V2:
> - Removes a header declaration I forgot to move previously
> - Cleans up the refs_warn_dangling_symrefs API to be more sane
> - Drops the ref shortening that seems ill-advised in retrospect
>
> Phil Hord (2):
> refs: remove old refs_warn_dangling_symref
> clean up interface for refs_warn_dangling_symrefs
Hmph. On top of which commit did you base these two patches?
The second one does not apply on top of applying 1/2 on top of
either v2.48.1 (where I queued the last round), v2.50.0 (the obvious
choice for a new development), or 'master'.
$ git am -s <patch-2-of-2.txt
error: patch failed: builtin/fetch.c:1384
error: builtin/fetch.c: patch does not apply
error: patch failed: builtin/remote.c:1521
error: builtin/remote.c: patch does not apply
error: patch failed: refs.c:458
error: refs.c: patch does not apply
Thanks.
next prev parent reply other threads:[~2025-07-02 1:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-02 0:58 [PATCH v3 0/2] fetch --prune performance problem Phil Hord
2025-07-02 0:58 ` [PATCH v3 1/2] refs: remove old refs_warn_dangling_symref Phil Hord
2025-07-02 0:58 ` [PATCH v3 2/2] clean up interface for refs_warn_dangling_symrefs Phil Hord
2025-07-02 1:42 ` Junio C Hamano [this message]
2025-07-02 1:47 ` [PATCH v3 0/2] fetch --prune performance problem Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqms9nfjvz.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.e.keller@intel.com \
--cc=peff@peff.net \
--cc=phil.hord@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox