git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: Sean <seanlkml@sympatico.ca>, git@vger.kernel.org
Subject: Re: renames in StGIT
Date: Tue, 24 Oct 2006 11:25:07 +0100	[thread overview]
Message-ID: <b0943d9e0610240325v5bc23078w7fc977e091e99779@mail.gmail.com> (raw)
In-Reply-To: <20061024091620.GB29265@diana.vm.bytemark.co.uk>

On 24/10/06, Karl Hasselström <kha@treskal.com> wrote:
> On 2006-10-24 09:48:44 +0100, Catalin Marinas wrote:
> > Step 3 above is handled per file by the
> > stgit.gitmergeonefile.merge() function. This is the place where we
> > should have the rename detection. Since, the majority of the patches
> > don't rename files and, in most cases, the push finishes at step 2,
> > it is probably safe to extend this function and the users won't
> > notice a speed difference.
> >
> > I'll add it to the TODO list.
>
> Sounds good. I had a feeling it ought to be basically free in the
> majority of cases, so I'm glad to learn I'm right. :-)

Might be even simpler for 'push' but I need to do more tests - instead
of calling git-read-tree in git.merge(), just call git-merge-recursive
which handles renames and it's fully tested. My simple test detected
renames when pushing patches (both rename in base and rename in
patch). I still have to do some tweaking and write proper tests (and
probably make it less verbose).

-- 
Catalin

      reply	other threads:[~2006-10-24 10:25 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-22  1:39 renames in StGIT Karl Hasselström
2006-10-23 16:47 ` Catalin Marinas
     [not found]   ` <20061023125344.f82426ad.seanlkml@sympatico.ca>
2006-10-24  8:17     ` Karl Hasselström
2006-10-24  8:48       ` Catalin Marinas
2006-10-24  9:16         ` Karl Hasselström
2006-10-24 10:25           ` Catalin Marinas [this message]

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=b0943d9e0610240325v5bc23078w7fc977e091e99779@mail.gmail.com \
    --to=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=kha@treskal.com \
    --cc=seanlkml@sympatico.ca \
    /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).