Re: [PATCH 0/2] Reorganize read-tree

Dan, I really really *REALLY* wanted to try this out in "pu" branch and even was about to rig some torture chamber for testing before applying the patch, but you got the shiny blue bat X-<. I've checked with both marc and gmane [*], and believe the problem is not on my end. The MUA seems to have

bug in git-fsck-cache?

Hi all, I have a tree that is a copy of Linus' git kernel tree in which I have been doing development and pulling updates and rebasing my patches etc. It now does this: $ git fsck-cache dangling tree 34d23b379f39922dff3cee671e28d41f3be56167 dangling blob 3eab2290b12a2cb683e4eadc20253bde37c84859

[PATCH] Change read-tree to merge before using the index.

Signed-off-by: Daniel Barkalow <[EMAIL PROTECTED]> --- read-tree.c | 522 ++- 1 files changed, 297 insertions(+), 225 deletions(-) d0f45ad81db2e133c49c23bd09c5615da344bb5c diff --git a/read-tree.c b/read-tree.c --- a/read-tree.c +++ b/read

[PATCH 1/2] Object model additions for read-tree

Adds object_list_append() and a function to get the struct tree from an ent. Signed-off-by: Daniel Barkalow <[EMAIL PROTECTED]> --- object.c | 11 +++ object.h |3 +++ tree.c | 19 +++ tree.h |3 +++ 4 files changed, 36 insertions(+), 0 deletions(-) 49d33

[PATCH 0/2] Reorganize read-tree

I got mostly done with this before Linus mentioned the possibility of having multiple index entries in the same stage for a single path. I finished it anyway, but I'm not sure that we won't want to know which of the common ancestors contributed which, and, if some of them don't have a path, we woul

Re: please pull ppc64-2.6.git

Christian Meder <[EMAIL PROTECTED]> writes: > Is alternates unthinkable with URLs (e.g. remote alternates). In order to read an object data, the low level core GIT layer does open()/mmap() of a file on the locally mounted filesystem. It also does opendir()/readdir()/closedir() to find what's avai

Re: [RFC] Stgit - patch history / add extra parents

Back from holiday. Thanks to all who replied to this thread. On Tue, 2005-08-23 at 14:05 -0400, Daniel Barkalow wrote: > Having a useful diff isn't really a requirement for a parent; the diff in > the case of a merge is going to be the total of everything that happened > elsewhere. The point is to

Re: please pull ppc64-2.6.git

On Mon, 2005-08-29 at 17:20 -0700, Linus Torvalds wrote: > > On Tue, 30 Aug 2005, Paul Mackerras wrote: > > > > What can one put in the alternates file? Just an absolute path, or > > does a relative path or a URL work too? > > Only an absolute path. > > URL's fundamentally do not work, and rel

Re: Cogito & Petr dormant?

Dear diary, on Tue, Aug 30, 2005 at 03:19:36AM CEST, I got a letter where Martin Langhoff <[EMAIL PROTECTED]> told me that... > Petr's tree in kernel.org hasn't been updated for 2 weeks, and we > haven't seen him on the list for about 2 weeks too. Is he on holiday > or otherwise MIA? I was working

Re: Fix bisection terminating condition

Linus Torvalds <[EMAIL PROTECTED]> writes: > When testing bisection and using gitk to visualize the result, it was > obvious that the termination condition was broken. Thanks. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More maj

[PATCH] 'git bisect visualize'

Linus says: I'm testing bisection to find a bug that causes my G5 to no longer boot, and during the process have found this command line very nice: gitk bisect/bad --not $(cd .git/refs ; ls bisect/good-*) it basically shows the state of bisection with the known bad commit

Re: Bisection visualization hint..

On Tue, 30 Aug 2005, A Large Angry SCM wrote: > > Unless gitk will always be part of git, this is better off as a gitk > feature or gitk helper script. IE. it belongs in the gitk namespace, not > the git namespace. I really think that gitk is pretty fundamental. If for no other reason than t

Fix bisection terminating condition

When testing bisection and using gitk to visualize the result, it was obvious that the termination condition was broken. We know what the bad entry is only when the bisection ends up telling us to test the known-bad entry again. Also, add a safety net: if somebody marks as good something that

Re: Bisection visualization hint..

Junio C Hamano wrote: Linus Torvalds <[EMAIL PROTECTED]> writes: I'm testing bisection to find a bug that causes my G5 to no longer boot, and during the process have found this command line very nice: gitk bisect/bad --not $(cd .git/refs ; ls bisect/good-*) it basically shows the sta

Re: Bisection visualization hint..

Linus Torvalds <[EMAIL PROTECTED]> writes: > I'm testing bisection to find a bug that causes my G5 to no longer boot, > and during the process have found this command line very nice: > > gitk bisect/bad --not $(cd .git/refs ; ls bisect/good-*) > > it basically shows the state of bisection w

Bisection visualization hint..

I'm testing bisection to find a bug that causes my G5 to no longer boot, and during the process have found this command line very nice: gitk bisect/bad --not $(cd .git/refs ; ls bisect/good-*) it basically shows the state of bisection with the known bad commit as the top, and cutting o

Re: [PATCH] cg-diff fixed to work with BSD xargs

Martin Langhoff <[EMAIL PROTECTED]> writes: > Calls to cg-diff without filename parameters were dependent on GNU xargs > traits. BSD xargs is hardcoded to do --no-run-if-empty -- so if the filter > is effectively empty we avoid calling xargs. > > Signed-off-by: Martin Langhoff <[EMAIL PROTECTED]>

Re: Status of Mac OS/X ports of git and cogito?

On 8/29/05, Martin Langhoff <[EMAIL PROTECTED]> wrote: > Blame the xargs implementation. Fixed. I posted the patch at the same time that I was writing this, but it got eaten by a b0rken MTA setup on my laptop. Reposted. cheers, martin - To unsubscribe from this list: send the line "unsubscribe

[PATCH] cg-diff fixed to work with BSD xargs

Calls to cg-diff without filename parameters were dependent on GNU xargs traits. BSD xargs is hardcoded to do --no-run-if-empty -- so if the filter is effectively empty we avoid calling xargs. Signed-off-by: Martin Langhoff <[EMAIL PROTECTED]> --- cg-diff |6 +- 1 files changed, 5 inser

[PATCH] cg-update - refuse to update dirty tree

cg-merge currently clobbers local changes while runnign cg-update. Do the safe thing and refuse to update on a dirty tree. Signed-off-by: Martin Langhoff <[EMAIL PROTECTED]> --- cg-update |4 1 files changed, 4 insertions(+), 0 deletions(-) 7a961c02ee6228c2a80869b4b3f179a7e279df8e di

[PATCH] Initial import of git-archimport-script

Imports a project history from one or more Arch repositories, following the branching and tagging across repositories. Note you should import separate projects to separate GIT repositories. Supported - Imports, tags and simple commits. - File renames - Arch tags - Binary files - Large trees

Re: gitk with hyperspace support

Paul Mackerras <[EMAIL PROTECTED]> writes: > It also makes the current graph line thicker now, so it's easier to > pick out where the line you clicked on goes. Very nice, and quite helpful for colour challenged ones. Thanks. - To unsubscribe from this list: send the line "unsubscribe git" in th

Re: [PATCH 1/9] Fix git patch header processing in git-apply.

On 8/30/05, Linus Torvalds <[EMAIL PROTECTED]> wrote: > Actually, an import should preferably never use patches at all, since that > never really works for binary data. This is why the CVS importer actually > checks out full files and imports them that way. The patch-based ones will > fundamentally