From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: What's cooking in git.git (Aug 2011, #01; Wed, 3)
Date: Thu, 04 Aug 2011 09:19:49 +0200 [thread overview]
Message-ID: <4E3A4815.5060309@viscovery.net> (raw)
In-Reply-To: <7vzkjq6mpn.fsf@alter.siamese.dyndns.org>
Am 8/4/2011 2:32, schrieb Junio C Hamano:
> * en/merge-recursive (2011-07-14) 50 commits
> - fixup! Do not assume that qsort is stable
...
> - merge-recursive: Fix sorting order and directory change assumptions
...
> The tip one should be squashed somewhere.
I suggest this one.
> I wanted to push this out in
> 'next' today, but this seems to regress a rather trivial renaming merge,
> so I had to rewind and rebuild 'next' before pushing it out.
Also, make_room_for_path() walks the entire list of files to remove on
each invocation and calls unlink() on each of them, which fails after the
name was re-created as a directory. IIUC, this is O(N*M) behavior where N
is the number of files to remove and M is the number of directories to
create, and causes unnecessary system calls. (Well, this can be fixed when
the series is in next because it is not as critical as the regression that
you found.)
-- Hannes
next prev parent reply other threads:[~2011-08-04 7:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-04 0:32 What's cooking in git.git (Aug 2011, #01; Wed, 3) Junio C Hamano
2011-08-04 7:19 ` Johannes Sixt [this message]
2011-08-04 10:57 ` Ramkumar Ramachandra
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=4E3A4815.5060309@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.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 NNTP newsgroup(s).