On Thu, 2005-09-08 at 17:39 -0400, Daniel Barkalow wrote:
> I assume that what you want is something to include everything from two
> commits, which would give conflicts if a name is reused?
>
Yes.
--
Darrin
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a mes
On Mon, 2005-09-05 at 01:41 -0400, Daniel Barkalow wrote:
> I've got a version of read-tree which accepts multiple ancestors and does
> a merge using information from all of them.
Do the multiple ancestors have to share a common parent? More to the
point, is this read-tree any more friendly to ba
On Thu, 2005-08-25 at 15:26 -0700, Junio C Hamano wrote:
> empty=`GIT_INDEX_FILE=.no-such-file git-write-tree`
> git-read-tree -m -u $empty $head $foreign ||
o. Tricky.
Thanks for the script. That's a bad, bad hack. :-)
> One thing that makes me reluctant to recommend this "m
That didn't come out clearly. Restating:
On Thu, 2005-08-25 at 16:10 -0500, Darrin Thompson wrote:
> Could git-read-tree -m 3-args be made smart enough to treat a 0 as arg 1
> as an implicit empty tree?
>
Could git-read-tree -m treat an argument of "0" as an implicit emp
On Wed, 2005-08-24 at 19:38 -0700, Junio C Hamano wrote:
> * Update tutorial to cover shared repository style a bit more,
> maybe with a toy project that involves two or three
> repositories.
>
Shameless plug: Feel free to use/modify/steal my writeup:
http://willowbend.cx/archives/2005/08/24
On Mon, 2005-08-08 at 11:41 +0200, Josef Weidendorfer wrote:
> Perhaps we should call it "remoterefs/" instead?
>
How about .git/peers/ ?
--
Darrin
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger
On Sat, 2005-07-30 at 23:51 -0700, Junio C Hamano wrote:
> Darrin Thompson <[EMAIL PROTECTED]> writes:
>
> > 1. Pack files should reduce the number of http round trips.
> > 2. What I'm seeing when I check out mainline git is the acquisition of a
> > singl
On Fri, 2005-07-29 at 17:08 +0200, Radoslaw AstralStorm Szkodzinski
wrote:
> On Fri, 29 Jul 2005 09:57:36 -0500
> Darrin Thompson <[EMAIL PROTECTED]> wrote:
>
> > Can't see the code.
> >
> > http://www.kernel.org/pub/software/scm/gitweb/gitweb.cgi
> >
On Fri, 2005-07-29 at 10:48 -0400, Ryan Anderson wrote:
> On Fri, Jul 29, 2005 at 09:03:41AM -0500, Darrin Thompson wrote:
> >
> > Where is the code for gitweb? (i.e. http://kernel.org/git ) Seems like
> > it could benefit from some git-send-pack superpowers.
>
>
On Thu, 2005-07-28 at 22:35 -0700, Junio C Hamano wrote:
> Darrin Thompson <[EMAIL PROTECTED]> writes:
>
> > In the tutorial the user is instructed to create two files: a and b.
> >
> > Then when the user diffs the files, they see this:
> >
> > diff
On Thu, 2005-07-28 at 19:24 -0700, Junio C Hamano wrote:
> The thing is, the base pack for the git repository is 1.8MB
> currently containing 4500+ objects, while we accumulated 600+
> unpacked objects since then which is about ~5MB. The commit
> walker needs to fetched the latter one by one in th
On Thu, 2005-07-28 at 15:20 -0500, Darrin Thompson wrote:
> In the tutorial the user is instructed to create two files: a and b.
>
> Then when the user diffs the files, they see this:
>
> diff --git a/a b/a
>
> That really confused somebody and I had to untangle their brai
Junio,
I just ran git clone against the mainline git repository using both http
and rsync. http was still quite slow compared to rsync. I expected that
the http time would be much faster than in the past due to the pack
file.
Is there something simple I'm missing?
--
Darrin
-
To unsubscribe fr
In the tutorial the user is instructed to create two files: a and b.
Then when the user diffs the files, they see this:
diff --git a/a b/a
That really confused somebody and I had to untangle their brain. :-) I
don't have a patch for it, but thought I'd point out: perhaps a and b
aren't the best
On Sat, 2005-07-23 at 12:21 +0200, Dirk Behme wrote:
> In the past, for bk I used
>
> $ export http_proxy=http://user:[EMAIL PROTECTED]:8080/
>
> which worked. But no luck with cogito/git.
>
> Looking into recent cogito/git, the reason for this seems to be that
> cogito/git uses a combination o
On Thu, 2005-07-14 at 16:06 -0400, James Cloos wrote:
> >>>>> "Darrin" == Darrin Thompson <[EMAIL PROTECTED]> writes:
>
> JimC> cg-merge: merge blocked: seeked from master `
>
> Darrin> cg-seek master ?
>
> :; cg seek master
>
On Thu, 2005-07-14 at 14:04 -0400, James Cloos wrote:
> I'm getting this on my clone of linus' tree:
>
> ,
> | cg-merge: merge blocked: seeked from master
> `
>
> I've not found a way past it.
cg-seek master ?
--
Darrin
-
To unsubscribe from this list: send the line "unsubscribe git"
On Wed, 2005-07-13 at 13:11 -0700, Junio C Hamano wrote:
> [EMAIL PROTECTED] (Darrin Thompson) writes:
>
> > Cause setting environment variable GIT_SSL_NO_VERIFY to turn off
> > curl's ssl peer verification.
> >
> > Only use curl for http transfers, instead o
d4a3c
parent e30e814dbfef7a6e89418863e5d7291a2d53b18f
author Darrin Thompson <[EMAIL PROTECTED]> Tue, 12 Jul 2005 16:27:05 -0500
git-fetch-script |7 +--
http-pull.c |6 ++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/git-fetch-script b/git-fetch-scrip
Daniel Barkalow wrote:
If I understand the curl documentation, you should be able to set options
on the curl object when it has just been created, if those options aren't
going to change between requests. Note that I make requests from multiple
places, but I use the same curl object for all of t
On Sun, 2005-07-10 at 15:56 -0400, Daniel Barkalow wrote:
> + curl_easy_setopt(curl, CURLOPT_FILE, indexfile);
> + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite);
> + curl_easy_setopt(curl, CURLOPT_URL, url);
I was hoping to send in a patch which would turn on user auth and turn
21 matches
Mail list logo
