From: Fredrik Kuivinen <freku045@student.liu.se>
To: Junio C Hamano <junkio@cox.net>
Cc: Fredrik Kuivinen <freku045@student.liu.se>, git@vger.kernel.org
Subject: Re: What's new in git.git master branch
Date: Fri, 2 Dec 2005 09:36:52 +0100 [thread overview]
Message-ID: <20051202083652.GA4824@c165.ib.student.liu.se> (raw)
In-Reply-To: <7vmzjljgwo.fsf@assigned-by-dhcp.cox.net>
On Thu, Dec 01, 2005 at 01:38:47AM -0800, Junio C Hamano wrote:
> Currently, rename result is recorded by using "git-update-index
> --cacheinfo" to populate the index. This method unfortunately
> can only create a stage0 entry. We can go two ways. One way is
> to support "register this mode/sha1 tuple at stageN for path" to
> update-index. Another would be for merge-recursive to first
> construct three trees with the final directory structure
> (i.e. prepare three temporary trees with renames applied) and
> run read-tree 3-way merge on these temporary trees. I suspect
> the former is probably of lesser impact. Thoughts?
If we really want to do this then the former is certainly easier from
the perspective of git-merge-recursive.
- Fredrik
next prev parent reply other threads:[~2005-12-02 8:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-30 22:57 What's new in git.git master branch Junio C Hamano
2005-12-01 8:54 ` Fredrik Kuivinen
2005-12-01 9:38 ` Junio C Hamano
2005-12-02 5:45 ` Junio C Hamano
2005-12-02 5:46 ` Junio C Hamano
2005-12-02 8:46 ` Fredrik Kuivinen
2005-12-02 8:36 ` Fredrik Kuivinen [this message]
2005-12-07 10:01 ` [PATCH 3/3] update-index: allow --index-info to add higher stages Junio C Hamano
2005-12-01 18:35 ` git-ls-tree: add "-t" option to always show the tree entries Linus Torvalds
2005-12-01 21:15 ` Junio C Hamano
2005-12-01 21:57 ` Linus Torvalds
2005-12-01 22:04 ` Junio C Hamano
2005-12-01 22:56 ` [PATCH] ls-tree: --name-only Junio C Hamano
2005-12-02 22:12 ` git-ls-tree: add "-t" option to always show the tree entries Junio C Hamano
2005-12-02 23:11 ` Linus Torvalds
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=20051202083652.GA4824@c165.ib.student.liu.se \
--to=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox