From: Taylor Blau <me@ttaylorr.com>
To: Elijah Newren <newren@gmail.com>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH 0/1] Object ID support for git merge-file
Date: Mon, 30 Oct 2023 11:54:14 -0400 [thread overview]
Message-ID: <ZT/RpqvfQyx+uzxa@nand.local> (raw)
In-Reply-To: <CABPp-BFJn5NsSaaxEMpicqND_-8CBw370kyBQuKHGOX-3PRyMw@mail.gmail.com>
On Sat, Oct 28, 2023 at 11:24:06PM -0700, Elijah Newren wrote:
> On Tue, Oct 24, 2023 at 12:58 PM brian m. carlson
> <sandals@crustytoothpaste.net> wrote:
> >
> > This series introduces an --object-id option to git merge-file such
> > that, instead of reading and writing from files on the system, it reads
> > from and writes to the object store using blobs.
>
> This seems like a reasonable capability to want from such a plumbing command.
Agreed.
> > This is in use at
> > GitHub to produce conflict diffs when a merge fails, and it seems
> > generally useful, so I'm sending it here.
>
> But...wouldn't you already have the conflicts generated when doing the
> merge and learning that it fails? Why would you need to generate them
> again?
brian would know better than I do, but I believe the reason is because
the "attempt this merge" RPC is handled separately from the "show me the
merge conflict(s) at xyz path". Those probably could be combined
(obviating the need for this patch), but doing so is probably rather
complicated.
Since this feature is generally useful for callers that haven't already
completed a tree-level merge and really just care about the result of
merging a single path, I don't have any objections here.
Thanks,
Taylor
next prev parent reply other threads:[~2023-10-30 15:54 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-24 19:56 [PATCH 0/1] Object ID support for git merge-file brian m. carlson
2023-10-24 19:56 ` [PATCH 1/1] merge-file: add an option to process object IDs brian m. carlson
2023-10-24 20:12 ` Eric Sunshine
2023-10-24 21:23 ` brian m. carlson
2023-10-29 6:17 ` Elijah Newren
2023-10-29 10:12 ` Phillip Wood
2023-10-30 16:14 ` brian m. carlson
2023-10-29 14:18 ` brian m. carlson
2023-10-30 16:39 ` Elijah Newren
2023-10-29 6:24 ` [PATCH 0/1] Object ID support for git merge-file Elijah Newren
2023-10-29 10:15 ` Phillip Wood
2023-10-30 15:54 ` Taylor Blau [this message]
2023-10-30 16:24 ` brian m. carlson
2023-10-30 17:14 ` Elijah Newren
2023-10-30 16:26 ` [PATCH v2 " brian m. carlson
2023-10-30 16:26 ` [PATCH v2 1/1] merge-file: add an option to process object IDs brian m. carlson
2023-10-31 21:48 ` Martin Ågren
2023-10-31 22:31 ` brian m. carlson
2023-11-01 3:44 ` Junio C Hamano
2023-11-01 19:16 ` brian m. carlson
2023-10-30 17:15 ` [PATCH v2 0/1] Object ID support for git merge-file Elijah Newren
2023-10-31 0:03 ` Junio C Hamano
2023-10-31 11:05 ` Phillip Wood
2023-10-31 23:06 ` Junio C Hamano
2023-11-01 19:24 ` [PATCH v3 0/2] " brian m. carlson
2023-11-01 19:24 ` [PATCH v3 1/2] git-merge-file doc: drop "-file" from argument placeholders brian m. carlson
2023-11-01 23:53 ` Junio C Hamano
2023-11-02 8:53 ` Martin Ågren
2023-11-02 9:18 ` brian m. carlson
2023-11-02 9:29 ` Martin Ågren
2023-11-02 16:28 ` Junio C Hamano
2023-11-01 19:24 ` [PATCH v3 2/2] merge-file: add an option to process object IDs brian m. carlson
2023-11-02 8:51 ` Martin Ågren
2023-11-01 23:55 ` [PATCH v3 0/2] Object ID support for git merge-file 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZT/RpqvfQyx+uzxa@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=sandals@crustytoothpaste.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).