From: Daniel Barkalow <barkalow@iabervon.org>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: Junio C Hamano <junkio@cox.net>,
git@vger.kernel.org, Linus Torvalds <torvalds@osdl.org>
Subject: Re: [PATCH 0/2] Reorganize read-tree
Date: Wed, 31 Aug 2005 13:04:39 -0400 (EDT) [thread overview]
Message-ID: <Pine.LNX.4.63.0508311257480.23242@iabervon.org> (raw)
In-Reply-To: <tnxy86ikxan.fsf@arm.com>
On Wed, 31 Aug 2005, Catalin Marinas wrote:
> Daniel Barkalow <barkalow@iabervon.org> wrote:
> > I got mostly done with this before Linus mentioned the possibility of
> > having multiple index entries in the same stage for a single path. I
> > finished it anyway, but I'm not sure that we won't want to know which of
> > the common ancestors contributed which, and, if some of them don't have a
> > path, we wouldn't be able to tell.
>
> I don't have time to look at the patch and I don't have a good
> knowledge of the GIT internals, so I will just ask. Does this patch
> changes the call convention for git-merge-one-file-script? I have my
> own script for StGIT and I would need to know whether it is affected
> or not.
Nope, it only changes the trivial merge calling convention within
read-tree.c; I think it's plausible that we might like to add information
at some point, but the short-term goal is just to prevent a few bad cases
in trivial merges.
next prev parent reply other threads:[~2005-08-31 17:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-31 3:48 [PATCH 0/2] Reorganize read-tree Daniel Barkalow
2005-08-31 3:49 ` [PATCH 1/2] Object model additions for read-tree Daniel Barkalow
2005-08-31 3:49 ` [PATCH] Change read-tree to merge before using the index Daniel Barkalow
2005-08-31 6:28 ` [PATCH 0/2] Reorganize read-tree Junio C Hamano
2005-08-31 16:56 ` Daniel Barkalow
2005-08-31 14:15 ` Catalin Marinas
2005-08-31 17:04 ` Daniel Barkalow [this message]
2005-08-31 16:57 ` [PATCH 1/2 (resend)] Object model additions for read-tree Daniel Barkalow
2005-08-31 16:57 ` [PATCH 2/2 (resend)] Change read-tree to merge before using the index Daniel Barkalow
2005-09-05 2:04 ` [PATCH 0/2] Reorganize read-tree Junio C Hamano
2005-09-05 2:55 ` Daniel Barkalow
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=Pine.LNX.4.63.0508311257480.23242@iabervon.org \
--to=barkalow@iabervon.org \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=torvalds@osdl.org \
/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).