From: Antonin Delpeuch <antonin@delpeuch.eu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: Custom merge drivers: accessing the pathnames and revisions of the files being merged
Date: Tue, 16 Jan 2024 22:59:53 +0100 [thread overview]
Message-ID: <4e6dddd1-2149-403b-82ed-b822c4b0c31e@delpeuch.eu> (raw)
In-Reply-To: <xmqqedeh1816.fsf@gitster.g>
Thanks a lot for your insights! Yes I also very much appreciate that the
extension point is built in such a way that introducing new parameters
is non-breaking.
On 16/01/2024 18:51, Junio C Hamano wrote:
> * Whatever letters we choose, they must have mnemonic value that
> signals two of them are the both sides of the merge that are
> equal participants, and the other one is the old-file, their
> common ancestor that plays quite a different from these two in
> the merge. I cannot tell which one of the XYZ would be the more
> special than other two, which is the primary reason why I do not
> know if XYZ is a good idea.
That makes perfect sense. How about:
- %S for the "source" pathname (corresponding to the %O file)
- %X for the first side of the merge (corresponding to the %A file)
- %Y for the second side of the merge (corresponding to the %B file)
Anyway, I'll try to work on a patch: it should be easy to adapt the
letters to any other choice.
Best,
Antonin
prev parent reply other threads:[~2024-01-16 22:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-16 8:44 Custom merge drivers: accessing the pathnames and revisions of the files being merged Antonin Delpeuch
2024-01-16 17:51 ` Junio C Hamano
2024-01-16 21:59 ` Antonin Delpeuch [this message]
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=4e6dddd1-2149-403b-82ed-b822c4b0c31e@delpeuch.eu \
--to=antonin@delpeuch.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).