From: Franck <vagabon.xyz@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [QUESTION] Access to a huge GIT repository.
Date: Tue, 22 Nov 2005 11:40:36 +0100 [thread overview]
Message-ID: <cda58cb80511220240u45267b18o@mail.gmail.com> (raw)
In-Reply-To: <7vfyppf1va.fsf@assigned-by-dhcp.cox.net>
2005/11/22, Junio C Hamano <junkio@cox.net>:
> I was not talking about _your_ case specifically. If you happen
> to have based your partial history on top of a single commit
> then the set of "such and such commits" might be only one, but
> you could for example clone from Linus tip, merge in a couple of
> jgarzik branch heads, put your own commits on top of them and
> then cauterize your history, stopping at those foreign commits.
> In such a case you obviously need to tell others where you
> chopped your history off.
>
I built the lite repository and got an error depending on which
original repo I used to push the lite one. Here is the history:
--------------------------------------------------------------
#
# building my pub repo from the "lite" repository
#
$ git checkout -b lite
$ git-show-branch
* [lite] Merge with Linux 2.6.14.
! [master] Merge with Linux 2.6.14.
! [origin] Merge with db93a82fa9d8b4d6e31c227922eaae829253bb88.
---
# push the initial commit object
$ git push /home/franck/pub/linux/git/linux-lite.git lite
updating 'refs/heads/lite'
from 0000000000000000000000000000000000000000
to 8643db584b46a61c968ae230897869f789bae020
Packing 19558 objects
Unpacking 19558 objects
100% (19558/19558) done
refs/heads/lite: 0000000000000000000000000000000000000000 ->
8643db584b46a61c968ae230897869f789bae020
#
# push first changes from lite repositoy -> KO
#
$ making some hard work
$ git commit -m "Did some hard work"
$ git push /home/franck/pub/linux/git/linux-lite.git lite
updating 'refs/heads/lite'
from 8643db584b46a61c968ae230897869f789bae020
to 730518eea7523afd5b7891bb7849973cab52d963
Packing 0 objects
Unpacking 0 objects
error: unpack should have generated
730518eea7523afd5b7891bb7849973cab52d963, but I can't find it!
$
#
# push first changes from "full" repository -> OK
#
# go to full repository and checkout linux.2.6.14
$ git commit -m "Did some hard work"
$ git push /home/franck/pub/linux/git/linux-lite.git lite
updating 'refs/heads/lite'
from 8643db584b46a61c968ae230897869f789bae020
to 067d05600fe7251b8c923fbeb9ba0068ee272110
Packing 108 objects
Unpacking 108 objects
100% (108/108) done
refs/heads/lite: 8643db584b46a61c968ae230897869f789bae020 ->
067d05600fe7251b8c923fbeb9ba0068ee272110
--------------------------------------------------------------
It seems that the "lite" repository can't be used as a working
repository. And If I use the last method to push some work, I can only
pull that changes from a full repository. From a lite one (without any
changes of course) I get this error:
$ git pull /home/franck/pub/linux/git/linux-lite.git lite
Packing 108 objects
Unpacking 108 objects
100% (108/108) done
Merging HEAD with f42aaff3bf8041c2d43f1ff6fdfe5df6e8a5b00b
Merging:
8643db584b46a61c968ae230897869f789bae020 Merge with Linux 2.6.14.
f42aaff3bf8041c2d43f1ff6fdfe5df6e8a5b00b Did some hard work
found 0 common ancestor(s):
Traceback (most recent call last):
File "/home/fbuihuu/bin/git-merge-recursive", line 870, in ?
firstBranch, secondBranch, graph)
File "/home/fbuihuu/bin/git-merge-recursive", line 67, in merge
mergedCA = ca[0]
IndexError: list index out of range
No merge strategy handled the merge.
Do you have any clues ?
Thanks
--
Franck
next prev parent reply other threads:[~2005-11-22 10:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-16 12:24 [QUESTION] Access to a huge GIT repository Franck
2005-11-16 16:46 ` Linus Torvalds
2005-11-17 10:36 ` Franck
2005-11-17 16:23 ` Linus Torvalds
2005-11-17 21:47 ` Franck
2005-11-17 22:44 ` Linus Torvalds
2005-11-19 12:23 ` Franck
2005-11-19 12:45 ` Lukas Sandström
2005-11-19 20:42 ` Junio C Hamano
2005-11-19 17:56 ` Linus Torvalds
2005-11-19 19:52 ` Junio C Hamano
2005-11-21 20:11 ` Franck
2005-11-21 20:45 ` Junio C Hamano
2005-11-22 9:22 ` Franck
2005-11-22 9:50 ` Junio C Hamano
2005-11-22 10:40 ` Franck [this message]
2005-11-22 17:06 ` Junio C Hamano
2005-11-22 19:10 ` Franck
2005-11-16 18:24 ` Junio C Hamano
2005-11-16 20:01 ` Martin Langhoff
2005-11-16 20:10 ` Linus Torvalds
2005-11-16 20:35 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cda58cb80511220240u45267b18o@mail.gmail.com \
--to=vagabon.xyz@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).