From: fork0@t-online.de (Alex Riesen)
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <junkio@cox.net>,
Fredrik Kuivinen <freku045@student.liu.se>,
Linus Torvalds <torvalds@osdl.org>
Subject: Re: CFT: merge-recursive in C (updated)
Date: Thu, 29 Jun 2006 02:25:47 +0200 [thread overview]
Message-ID: <20060629002547.GA27507@steel.home> (raw)
In-Reply-To: <81b0412b0606280234x7d07fbbck7887b5214d98bf91@mail.gmail.com>
Alex Riesen, Wed, Jun 28, 2006 11:34:23 +0200:
> >> > - use a pipe to "git-update-index --index-info" instead of
> >> > using command line
>
> ...and to take it a step further, a patch (0002) to avoid too many calls to
> git-write-tree and to git-update-index. Brought merge times on my test
> monster (~25k files) down to 2min 30sec (from something around 11 min).
this broke t6022-merge-rename.sh (the second test). It produces an
index with this:
.../t/trash$ git-diff-index white
:100644 100644 2d603156dc5bdf6295c789cac08e3c9942a0b82a 0000000000000000000000000000000000000000 M B
:100644 100644 ba41fb96393979b22691106b06bf5231eab57b85 0000000000000000000000000000000000000000 M N
whereas git-merge-recursive (and the previous version, without pipe):
.../t/trash$ git-diff-index white
:100644 100644 2d603156dc5bdf6295c789cac08e3c9942a0b82a 0000000000000000000000000000000000000000 M B
I can see that "git update-index --add" is somehow different from a
pipe to "git update-index --index-info", but not very clear. Does this
"zero-sha1" mean that the file "N" is not in the index?
next prev parent reply other threads:[~2006-06-29 0:26 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-27 15:48 CFT: merge-recursive in C (updated) Alex Riesen
2006-06-27 16:42 ` Johannes Schindelin
2006-06-27 22:32 ` Alex Riesen
2006-06-28 9:34 ` Alex Riesen
2006-06-28 10:04 ` Johannes Schindelin
2006-06-28 11:35 ` Alex Riesen
2006-06-28 12:55 ` Johannes Schindelin
2006-06-28 14:27 ` Alex Riesen
2006-06-28 15:09 ` Johannes Schindelin
2006-06-29 0:25 ` Alex Riesen [this message]
2006-06-29 2:41 ` Junio C Hamano
2006-06-29 8:43 ` Alex Riesen
2006-06-29 18:40 ` Johannes Schindelin
2006-06-29 23:28 ` Alex Riesen
2006-06-29 13:16 ` Johannes Schindelin
2006-06-29 13:16 ` [PATCH 1/2] refactor merge_bases() as preparation to libify merge-base Johannes Schindelin
2006-06-29 13:17 ` [PATCH] move get_merge_bases() to core lib; use it in merge-recursive Johannes Schindelin
2006-06-29 13:21 ` Johannes Schindelin
2006-06-29 14:12 ` Alex Riesen
2006-06-29 16:14 ` Johannes Schindelin
2006-06-29 14:13 ` Alex Riesen
2006-06-29 14:14 ` Alex Riesen
2006-06-29 16:14 ` Johannes Schindelin
2006-06-29 18:26 ` Linus Torvalds
2006-06-29 18:39 ` Junio C Hamano
2006-06-29 19:06 ` Johannes Schindelin
2006-06-29 20:58 ` Junio C Hamano
2006-06-30 0:27 ` Alex Riesen
2006-06-27 18:22 ` CFT: merge-recursive in C (updated) Linus Torvalds
2006-06-27 18:45 ` Johannes Schindelin
2006-06-27 19:10 ` Linus Torvalds
2006-06-27 22:36 ` Alex Riesen
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=20060629002547.GA27507@steel.home \
--to=fork0@t-online.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=raa.lkml@gmail.com \
--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.
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 NNTP newsgroup(s).