From: Ondrej Certik Date: Wed, 26 Nov 2008 15:50:14 GMT Subject: Re: git fast-export | git fast-import doesn't work Message-ID: <85b5c3130811260750y2e24436ye2426ccfc2f66071@mail.gmail.com> In-Reply-To: <492D6CC3.2050408@drmicha.warpmail.net> On Wed, Nov 26, 2008 at 4:35 PM, Michael J Gruber wrote: > Ondrej Certik venit, vidit, dixit 26.11.2008 11:18: >> On Wed, Nov 26, 2008 at 10:35 AM, Ondrej Certik wrote: >>> On Wed, Nov 26, 2008 at 1:14 AM, Johannes Schindelin >>> wrote: >>>> Hi, >>>> >>>> On Tue, 25 Nov 2008, Ondrej Certik wrote: >>>> >>>>> I would like to export our whole git repository to patches, and then >>>>> reconstruct it again from scratch. Following the man page of "git >>>>> fast-export": >>>>> >>>>> [...] >>>>> >>>>> However, the repository is very different to the original one. It >>>>> contains only 191 patches: >>>> Can you try again with a Git version that contains the commit >>>> 2075ffb5(fast-export: use an unsorted string list for extra_refs)? >>> I tried the next branch: >>> >>> $ git --version >>> git version 1.6.0.4.1060.g9433b >>> >>> that contains the 2075ffb5 patch. I haven't observed any change --- >>> the "git log" still only shows 191 commits (git log --all shows >>> everything). >> >> I deleted all tags and then fast-exported and imported, now all the >> commits show in "git log", however, the patches are wrongly connected. >> Basically, both repositories are identical (including hashes) up to >> this commit: >> >> d717177d4 (fixed downloads instructions in the README and a typo) >> >> However, the original repo (sympy-full-history-20081023) contains 3 >> children at this commit: > > There's some nice 3 way branching and double 2 way merging going on. I > cut out the interesting part of the graph, making d717177d4 and > 6e869485f parentless. The resulting mini DAG is reproduced correctly by > export|import, even with -M -C. 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. Ondrej