From: Alex Riesen <raa.lkml@gmail.com>
To: Steffen Prohaska <prohaska@zib.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] transplant: move a series of commits to a different parent
Date: Sun, 24 Jun 2007 20:35:52 +0200 [thread overview]
Message-ID: <20070624183552.GA2374@steel.home> (raw)
In-Reply-To: <EA80EB51-97F9-4C5F-BEF7-C8C1BF39B8D2@zib.de>
Steffen Prohaska, Sun, Jun 24, 2007 19:13:42 +0200:
> >>I am changing the repository.
> >
> >No, you don't.
>
> Magically, the script solved my problem by creating a new, corrected
> branch that is different from the original one. I didn't run any
> other script. I promise, I ran the script that I sent in the patch.
I meant: "it does not change the working directory". It is irrelevant,
was a bit of confusion on my part.
Your script works, just it can be made simplier: no need for diff,
it'll only hurt perfomance and complicates things. And you don't have
to care about additions/deletions, and it is trivially extensible to
support merges, and the current index is untouched - your user can
continue working in predictable environment.
As to perfomance: read-tree doesn't actually _read_ the blobs to
populate index, just the trees. And diff-tree has do do the same, but
also _compare_ two trees recursively: more work, more memory needed.
BTW, Johannes moved that ident code you copied from git-filter-branch
into its own shell file, so it can be sourced and trivially reused.
next prev parent reply other threads:[~2007-06-24 18:36 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-23 12:51 [PATCH] cvsimport: test case for severe branch import problem Steffen Prohaska
2007-06-23 13:26 ` Steffen Prohaska
2007-06-23 19:27 ` [PATCH] transplant: move a series of commits to a different parent Steffen Prohaska
2007-06-23 20:54 ` Johannes Schindelin
2007-06-24 6:55 ` Steffen Prohaska
2007-06-23 21:04 ` Alex Riesen
2007-06-24 7:08 ` Steffen Prohaska
2007-06-24 8:20 ` Alex Riesen
2007-06-24 10:26 ` Johannes Schindelin
2007-06-24 10:45 ` Steffen Prohaska
2007-06-25 7:16 ` Johannes Sixt
2007-06-25 7:49 ` Steffen Prohaska
2007-06-25 8:03 ` Johannes Sixt
2007-06-24 8:29 ` Alex Riesen
2007-06-24 9:05 ` Steffen Prohaska
2007-06-24 9:30 ` Alex Riesen
2007-06-24 17:13 ` Steffen Prohaska
2007-06-24 18:35 ` Alex Riesen [this message]
2007-06-24 20:54 ` Steffen Prohaska
2007-06-24 22:20 ` 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=20070624183552.GA2374@steel.home \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.de \
/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).