git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ondrej Certik" <ondrej@certik.cz>
To: "Johannes Sixt" <j.sixt@viscovery.net>
Cc: "Michael J Gruber" <git@drmicha.warpmail.net>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Git Mailing List" <git@vger.kernel.org>,
	"Fabian Seoane" <fabian@fseoane.net>
Subject: Re: git fast-export | git fast-import doesn't work
Date: Thu, 27 Nov 2008 03:05:16 +0100	[thread overview]
Message-ID: <85b5c3130811261805n5628ee7agcff3d6ed7dea10bb@mail.gmail.com> (raw)
In-Reply-To: <492D7AEF.5030908@viscovery.net>

Hi Johannes!

On Wed, Nov 26, 2008 at 5:35 PM, Johannes Sixt <j.sixt@viscovery.net> wrote:
> Ondrej Certik schrieb:
>> I am also trying to make the example simpler. I tried to squash the
>> first uninteresting ~1500 commits into one, but "git rebase -i"
>> uterrly fails after squashing about 600 commits. Still investigating.
>
> Don't use rebase. Set a graft and rewrite the history:
>
>   $ echo $(git rev-parse HEAD) $(git rev-parse HEAD~1500) >> \
>                .git/info/grafts
>
> Assuming "first 1500" means the "most recent 1500" commits. But you get
> the idea. You can truncate history as well by omitting the second SHA1.
> It's very convenient to keep gitk open and File->Reload after each graft
> that you set.
>
> When you're done with setting grafts:
>
>   $ git filter-branch -f --tag-name-filter cat -- --all

Indeed, this seems to be working robustly. Thanks!

>
> (You are doing this on a copy of your repository, don't you?)

Yes.


I spent the whole today trying to isolate the bug, but so far I
haven't succeeded. Unfortunately, I need to work on other things now,
so I am postponing this to some later time. The repository that
reproduces it will stay online, so anyone feel free to produce a nice
and simple (failing) test for the bug.

Thanks,
Ondrej

  reply	other threads:[~2008-11-27  2:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-25 16:44 git fast-export | git fast-import doesn't work Ondrej Certik
2008-11-25 17:31 ` Michael J Gruber
2008-11-25 20:41   ` Miklos Vajna
2008-11-25 23:39     ` Ondrej Certik
2008-11-25 23:53       ` david
2008-11-25 23:44   ` Ondrej Certik
2008-11-25 17:34 ` Peter Baumann
2008-11-26  0:14 ` Johannes Schindelin
2008-11-26  9:35   ` Ondrej Certik
2008-11-26 10:18     ` Ondrej Certik
2008-11-26 15:35       ` Michael J Gruber
2008-11-26 15:50         ` Ondrej Certik
2008-11-26 16:35           ` Johannes Sixt
2008-11-27  2:05             ` Ondrej Certik [this message]
2009-05-03 19:06             ` Ondrej Certik
2008-11-26 16:40           ` Johannes Schindelin
2008-11-26 16:44             ` Michael J Gruber
2008-11-26 17:08               ` Johannes Schindelin
2008-12-07 11:25                 ` Alexander Gavrilov
2008-12-08 18:13                   ` Johannes Schindelin
2008-11-26 17:21             ` Ondrej Certik
2008-11-27  8:18               ` Andreas Ericsson
2008-11-26 10:18   ` Michael J Gruber
2008-11-26 12:46     ` Johannes Schindelin
2008-11-26 13:03       ` Ondrej Certik

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=85b5c3130811261805n5628ee7agcff3d6ed7dea10bb@mail.gmail.com \
    --to=ondrej@certik.cz \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=fabian@fseoane.net \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=j.sixt@viscovery.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;
as well as URLs for NNTP newsgroup(s).