Re: Yet another base64 patch

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 08:38:10AM CEST, I got a letter where "David A. Wheeler" <[EMAIL PROTECTED]> told me that... > I'd look at some of the more constraining, yet still > common cases, and make sure it worked reasonably > well without requiring magic. My list would be: > ext2, ext3,

Re: [1/5] Parsing code in revision.h

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 08:18:47PM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > > > On Sun, 17 Apr 2005, Daniel Barkalow wrote: > > > > --- 45f926575d2c44072bfcf2317dbf3f0fbb513a4e/revision.h (mode:100644 > > sha1:28d0de3261a61f68e4e0948a25a416a515

Re: [3/5] Add http-pull

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 08:49:11PM CEST, I got a letter where Daniel Barkalow <[EMAIL PROTECTED]> told me that... > On Sun, 17 Apr 2005, Petr Baudis wrote: > > > Index: http-pull.c > > >

git-viz tool for visualising commit trees

2005-04-17 Thread Petr Baudis
Hi, just FYI, Olivier Andrieu was kind enough to port his monotone-viz tool to git (http://oandrieu.nerim.net/monotone-viz/ - use the one from the monotone repository). The tool visualizes the history flow nicely; see http://rover.dkm.cz/~pasky/gitviz1.png http://rover.dkm.cz/

Re: [3/5] Add http-pull

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 09:24:27PM CEST, I got a letter where Daniel Barkalow <[EMAIL PROTECTED]> told me that... > On Sun, 17 Apr 2005, Petr Baudis wrote: > > > Dear diary, on Sun, Apr 17, 2005 at 08:49:11PM CEST, I got a letter > > where Daniel Barkalow <

Re: [4/5] Add option for hardlinkable cache of extracted blobs

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 10:03:46PM CEST, I got a letter where Daniel Barkalow <[EMAIL PROTECTED]> told me that... > On Sun, 17 Apr 2005, Petr Baudis wrote: > > > Dear diary, on Sun, Apr 17, 2005 at 09:25:17PM CEST, I got a letter > > where Paul Jackson <[EMA

Re: [4/5] Add option for hardlinkable cache of extracted blobs

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 09:25:17PM CEST, I got a letter where Paul Jackson <[EMAIL PROTECTED]> told me that... > Petr wrote: > > BTW, I'd just use access(F_OK) instead of stat() it I don't care about > > I recommend _only_ using it when you require exactly the above real vs. > effectiv

Re: [2.1/5] Add merge-base

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 06:51:59PM CEST, I got a letter where Daniel Barkalow <[EMAIL PROTECTED]> told me that... > merge-base finds one of the best common ancestors of a pair of commits. In > particular, it finds one of the ones which is fewest commits away from the > further of the he

Re: Re-done kernel archive - real one?

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 12:09:21AM CEST, I got a letter where "Randy.Dunlap" <[EMAIL PROTECTED]> told me that... > On Sun, 17 Apr 2005 23:50:40 +0200 Jochen Roemling wrote: > > | Linus Torvalds wrote: > | > | >Ie we have two phases to the merge: first get the objects, with something >

Re: Merge with git-pasky II.

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 01:29:05AM CEST, I got a letter where Herbert Xu <[EMAIL PROTECTED]> told me that... > I get the feeling that it isn't that bad. For example, if we did it > at the points where the blobs actually entered the tree, then the cost > is always proportional to the ch

Re: full kernel history, in patchset format

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 01:31:36AM CEST, I got a letter where David Woodhouse <[EMAIL PROTECTED]> told me that... > Note that any given copy of a tree doesn't _need_ to keep all the > history back the beginning of time. It's OK if the oldest commit object > in your tree actually refers

Re: [patch] git: fix 1-byte overflow in show-files.c

2005-04-17 Thread Petr Baudis
Dear diary, on Thu, Apr 14, 2005 at 02:53:54PM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > > this patch fixes a 1-byte overflow in show-files.c (looks narrow is is > probably not exploitable). A specially crafted db object (tree) might > trigger this overflow. >

Re: [patch] fork optional branch point normazilation

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 01:39:10AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > > > On Sun, 17 Apr 2005, Brad Roberts wrote: > > > > braddr:x:1000:1000:Brad Roberts,,,:/home/braddr:/bin/bash > > > > All gecos entries on all my debian boxes are of th

Re: full kernel history, in patchset format

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 02:06:43AM CEST, I got a letter where David Woodhouse <[EMAIL PROTECTED]> told me that... > On Mon, 2005-04-18 at 01:39 +0200, Petr Baudis wrote: > > Of course an entirely different thing are _trees_ associated with those > > commits. As lo

Re: full kernel history, in patchset format

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 02:45:22AM CEST, I got a letter where David Woodhouse <[EMAIL PROTECTED]> told me that... > On Mon, 2005-04-18 at 02:35 +0200, Petr Baudis wrote: > > > For the special case of removing history before 2.6.12-rc2 from the > > > trees,

Re: Merge with git-pasky II.

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 02:49:06AM CEST, I got a letter where Herbert Xu <[EMAIL PROTECTED]> told me that... > Therefore the only conclusion I can draw is that we're only calling > update-cache on the set of changed files, or at most a small superset > of them. In that case, the cost o

Re: full kernel history, in patchset format

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 02:51:59AM CEST, I got a letter where David Woodhouse <[EMAIL PROTECTED]> told me that... > On Mon, 2005-04-18 at 02:50 +0200, Petr Baudis wrote: > > I think I will make git-pasky's default behaviour (when we get > > http-pull, tha

Re: [4/5] Add option for hardlinkable cache of extracted blobs

2005-04-17 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 03:35:08AM CEST, I got a letter where Paul Jackson <[EMAIL PROTECTED]> told me that... > Petr wrote: > > The documentation I've got says: > > > > "R_OK, W_OK and X_OK request checking whether the file exists and has > > read, write and execute permissions, r

Re: [PATCH] Add help details to git help command.

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 06:42:26AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > There's a patch at the bottom of this, so please look at that first before > my reading my whining immediately below. > > I'm having some troubles with git pull, so this is j

Re: [PATCH] Pretty-print date in 'git log'

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 09:08:24AM CEST, I got a letter where David Woodhouse <[EMAIL PROTECTED]> told me that... > On Mon, 2005-04-18 at 07:43 +0100, Sanjoy Mahajan wrote: > > Is this short script good enough: > > It's not far off; thanks. We might as well just do it like that inside

Re: [pasky] recent changes to gitdiff.sh

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 12:40:08PM CEST, I got a letter where Martin Schlemmer <[EMAIL PROTECTED]> told me that... > Hi, Hello, > I see the recent changes to gitdiff.sh requires you to pass -r (git diff > -r local:$tracking) even if you separate the branches via ':'. Is this > intend

Re: Re-done kernel archive - real one?

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 11:23:32AM CEST, I got a letter where Russell King <[EMAIL PROTECTED]> told me that... > Ok, I just tried pulling your tree into the tree you pulled from, and > got this: > > Tree change: e7905b2f22eb5d5308c9122b9c06c2d02473dd4f > ee423ea56280512778a5961ee58a78

Re: First git-pasky bug report? :) error: bad signature/verify header failed

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 03:22:43PM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > Hi Hi, I should release early and often. :-) > Tree change: > c29b3b29c2861ab0ffb475c7a7c9cfc946106eaf:5bf2f464d382b0bd746d06e264bc6951e7bfcd3a > Tracked branch, applyin

Re: Re-done kernel archive - real one?

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 01:24:24AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > > > On Sun, 17 Apr 2005, Russell King wrote: > > > > I pulled it tonight into a pristine tree (which of course worked.) > > Goodie. > > > In doing so, I noticed that I

Re: Re-done kernel archive - real one?

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 07:05:19PM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > > > On Mon, 18 Apr 2005, Linus Torvalds wrote: > > > > No, that can't work. The pesky tools are helpful [...] > > I'm afraid that until Pasky's tools script this properl

Re: optimize gitdiff-do script

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 05:23:34PM CEST, I got a letter where Paul Jackson <[EMAIL PROTECTED]> told me that... > Pasky, > > Looks like a couple of questions I asked over the weekend > got lost along the way. Yes, sorry about that; I had a lot of mail traffic lately and I'm not so used

Re: [PATCH] Get commits from remote repositories by HTTP

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 08:41:42PM CEST, I got a letter where [EMAIL PROTECTED] told me that... > >Not a patch ... it is a whole file. I called it "git-wget", but it might > >also want to be called "git-pulltop". > > It's been pointed out to me that I based this script on a pre-histor

Re: Add + Status patches

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 10:39:00PM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > Hi Petr Hi, > Thankyou for the help earlier - problem resolved. > > I have a trivial patch (attached). > > It allows: > find src -type f | git add - > > and fixes git s

Re: [PATCH] fix bug in read-cache.c which loses files when merging a tree

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 11:19:46PM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > I suspect that I should just pass in the SHA1 of the files to the > "merge-one-file-script" from "merge-cache", rather than unpacking it. > After all, the merging script

[ANNOUNCE] git-pasky-0.5

2005-04-18 Thread Petr Baudis
Hello, so here finally goes git-pasky-0.5, my set of scripts upon Linus Torvald's git, which aims to provide a humanly usable interface, to a degree similar to a SCM tool. You can get it at http://pasky.or.cz/~pasky/dev/git/ See the READMEs etc for some introduction. This contai

Re: Re-done kernel archive - real one?

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 12:16:52AM CEST, I got a letter where Russell King <[EMAIL PROTECTED]> told me that... > Ok, since the last one was soo successful, and I'm up for more > punishment, here's another attempt. The diffstat is rather > interesting in this one, claiming no changes.

Re: Add + Status patches

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 12:18:12AM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > Junio C Hamano wrote: > > >DG> It allows: > >DG> find src -type f | git add - > > > >I am slow today, but have you considered using xargs? > > > > > > > yep thanks :) > I

Re: [PATCH 1/1] add, rm + status patches

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 12:18:07AM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > Petr Baudis wrote: > > > Thanks. Could you please send the patches signed off and either with > > content-disposition: inline or in the

Re: Re-done kernel archive - real one?

2005-04-18 Thread Petr Baudis
Dear diary, on Mon, Apr 18, 2005 at 11:53:57PM CEST, I got a letter where Russell King <[EMAIL PROTECTED]> told me that... > Maybe Petr can improve the error handling, and incorporate it (or at > least some of it) into git-pasky This does not need to touch git pull at all now; all the relevant log

Re: Re-done kernel archive - real one?

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 12:59:52AM CEST, I got a letter where Russell King <[EMAIL PROTECTED]> told me that... > In the case I highlighted, we don't want to end up having to require > user intervention. This is a common case here, and was one which was > entirely scripted with BK. Wel

Re: SCSI trees, merges and git status

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 01:23:24AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > However the "Getting object database" part trashed this symlink > when I tried to pull from my other repo locally. I am wondering > it the following might be a better alte

Re: Re-done kernel archive - real one?

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 12:16:52AM CEST, I got a letter where Russell King <[EMAIL PROTECTED]> told me that... > However, it seems that git diff can't handle new files appearing > yet. Fixed. :-) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: a

Re: GIT Web Interface

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 02:44:15AM CEST, I got a letter where Kay Sievers <[EMAIL PROTECTED]> told me that... > I'm hacking on a simple web interface, cause I missed the bkweb too much. > It can't do much more than browse through the source tree and show the > log now, but that should c

[PATCH] Automerge fix

2005-04-18 Thread Petr Baudis
Hello, this patch fixes git-merge-one-file-script's automerge. Signed-off-by: Petr Baudis <[EMAIL PROTECTED]> git-merge-one-file-script: 7ebf5dac4c69043cd2ff89bf7ee552152802f8d1 --- a/git-merge-one-file-script +++ b/git-merge-one-file-script @@ -43,7 +43,7 @@ case "${1:-.}${

Re: Re: Re: Add "clone" support to lntree

2005-04-18 Thread Petr Baudis
For the record, mostly... (this is how it already is in git-pasky-0.5) Dear diary, on Sun, Apr 17, 2005 at 02:07:36AM CEST, I got a letter where Daniel Barkalow <[EMAIL PROTECTED]> told me that... > > Now, what about git branch and git update for switching between > > branches? I think this is the

Re: [PATCH] provide better committer information to commit-tree.c

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 03:12:37AM CEST, I got a letter where Greg KH <[EMAIL PROTECTED]> told me that... > But I'll wait for Russell to wake up and start quoting the proper EU > privacy laws that he feels causes him to be forced to obfuscate his > email addresses in the changelog commi

Re: [RFC] Another way to provide help details. (was Re: [PATCH] Add help details to git help command.)

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 03:40:54AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Here is perhaps a better way to provide detailed help for each > git command. A command.help file for each command can be > written in the style of a man page. I don't like

Re: [2/4] Sorting commits by date

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 03:54:56AM CEST, I got a letter where Daniel Barkalow <[EMAIL PROTECTED]> told me that... > Index: commit.c > === > --- b3cf8daf9b619ae9f06a28f42a4ae01b69729206/commit.c (mode:100644 > sha1:0099baa

Re: [2/4] Sorting commits by date

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 04:52:26AM CEST, I got a letter where Daniel Barkalow <[EMAIL PROTECTED]> told me that... > because I can't find a way to make recent GCC reject C99 features but not > old GNU extensions. Do we use any? -- Petr "Pasky" Baudis St

Re: [PATCH] Automerge fix

2005-04-18 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 04:48:09AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > > git-merge-one-file-script: 7ebf5dac4c69043cd2ff89bf7ee552152802f8d1 > > --- a/git-merge-one-file-script > > +++ b/git-merge-one-file-script > > @@ -43,7 +43,7 @@ case "${

"True" git merge in git-pasky

2005-04-18 Thread Petr Baudis
Hello, so I've implemented "true" git merge in git-pasky, using core git's merging capabilities. It seems to even work. :-) I tested it briefly, and even did one non-conflicting and one conflicting merge with Linus with this, but I'd like to hear your comments and possibly more testing befo

Re: "True" git merge in git-pasky

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 07:43:07AM CEST, I got a letter where bert hubert <[EMAIL PROTECTED]> told me that... > On Tue, Apr 19, 2005 at 05:51:07AM +0200, Petr Baudis wrote: > > http://pasky.or.cz/~pasky/dev/git > > I pulled the tar.bz2 and did make: > g

Re: More git pull problems

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 09:02:51AM CEST, I got a letter where Russell King <[EMAIL PROTECTED]> told me that... > My automatic pull this morning produced the following messages, which > seem to indicate that something's up with git pull now. > > git-pasky-0.4 (7bef49b5d53218ed3fa8bac291

Re: More git pull problems

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 10:31:13AM CEST, I got a letter where Russell King <[EMAIL PROTECTED]> told me that... > On Tue, Apr 19, 2005 at 10:23:41AM +0200, Petr Baudis wrote: > > Dear diary, on Tue, Apr 19, 2005 at 09:02:51AM CEST, I got a letter > > where Russell K

Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 11:18:55AM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > What's the most common thing to do? pull or update? update for normal users. > which is easier to type? > what are people used to? I think 'git up' is easier to type than

Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 12:05:10PM CEST, I got a letter where Martin Schlemmer <[EMAIL PROTECTED]> told me that... > On Tue, 2005-04-19 at 11:28 +0200, Petr Baudis wrote: > > Dear diary, on Tue, Apr 19, 2005 at 11:18:55AM CEST, I got a letter > > where David Grea

Re: [darcs-devel] Darcs and git: plan of action

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 02:20:55PM CEST, I got a letter where Juliusz Chroboczek <[EMAIL PROTECTED]> told me that... > > The problem is that there is no sequence of alien versions that one can > > differentiate. Git has a branched history, with each version that follows > > a merge hav

Re: missing: git api, reference, user manual and mission statement

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 02:36:32PM CEST, I got a letter where Klaus Robert Suetterlin <[EMAIL PROTECTED]> told me that... > 1) There is no clear (e.g. by name) distinction between ``git as done > by Linus'', which is a kind of content addressable database with added > semantics, and ``g

Re: [script] ge: export commits as patches

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 03:48:43PM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > is there any 'export commit as patch' support in git-pasky? I didnt find > any such command (maybe it got added meanwhile), so i'm using the 'ge' > hack below. > > e.g. i t

Re: naive question

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 03:00:14PM CEST, I got a letter where Paul Mackerras <[EMAIL PROTECTED]> told me that... > Is there a way to check out a tree without changing the mtime of any > files that you have already checked out and which are the same as the > version you are checking out?

Re: [RFC] Another way to provide help details. (was Re: [PATCH] Add help details to git help command.)

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 04:41:34PM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > If Petr wants the top comment to be extracted by help then maybe a > bottom comment block could contain the more complete text? > I *really* think that the user docs should

Re: [PATCH] Add help details to git help command. (This time with Perl)

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 07:35:15PM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Example: ..snip a perfect-looking example.. > - > Speaking of 'git diff', I ran that before applying the following patch, > and got a diff starting thusly: > > --- /

Re: [script] ge: export commits as patches

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 08:56:07PM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > and please fix gitXnormid.sh to simply echo nothing and return with a -1 > exit value when a nonsensical ID is passed to it. Right now the output > is quite ugly if you do '

Bug in merge-base

2005-04-19 Thread Petr Baudis
Hello, I've hit a strange bug in merge-base I don't want to debug now. ;-) I've been doing my regular git pull test from my main branch, but suddenly git merge wanted to do a tree merge instead of fast-forward. What went wrong? The commits tree looks like: 36c764 -- 808162 -- .. -- 8

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:19:01AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Linus Torvalds wrote: > > > >On Tue, 19 Apr 2005, Greg KH wrote: > > > >>Nice, it looks like the merge of this tree, and my usb tree worked just > >>fine. > > > > > >Yup, it a

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 10:20:47PM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > Pasky? Can you check my latest git stuff, notably read-tree.c and the > changes to git-pull-script? I've made git merge to use read-tree -m, HTH. I will probably not buy

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:45:02AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > >>>>> "PB" == Petr Baudis <[EMAIL PROTECTED]> writes: > > PB> I'm wondering if doing > > PB> if [ &quo

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:38:17AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > Just say no to patches. FYI, I've - per Junio's suggestion - made git merge's fast-forward to apply show-diff output as a patch instead. This is roughly equal to doing th

Re: [GIT PATCH] I2C and W1 bugfixes for 2.6.12-rc2

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 01:04:48AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Then, the flurry of patching file blah messages, followed by a rather > pregnant pause after the last patching message. > > I wasn't complaining about the 4 minutes, just th

Re: git-viz tool for visualising commit trees

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:08:24PM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > * Petr Baudis <[EMAIL PROTECTED]> wrote: > > just FYI, Olivier Andrieu was kind enough to port his monotone-viz > > tool to git (http://oand

Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 09:01:57AM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > [...] > fatal: unable to execute 'gitmerge-file.sh' > fatal: merge program failed Pure stupidity of mine, I forgot to add gitmerge-file.sh to the list of scripts which get

[ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Hello, so I've "released" git-pasky-0.6.2 (my SCMish layer on top of Linus Torvalds' git tree history storage system), find it at the usual http://pasky.or.cz/~pasky/dev/git/ git-pasky-0.6 has couple of big changes; mainly enhanced git diff, git patch (to be renamed to cg mkpatch),

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 10:56:33PM CEST, I got a letter where Petr Baudis <[EMAIL PROTECTED]> told me that... > cg pull will now always only pull, never merge. > > cg update will do pull + merge. Note that what you will probably do _most_ by far is cg update. You

Re: Change "pull" to _only_ download, and "git update"=pull+merge?

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 10:32:35PM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > > * Petr Baudis <[EMAIL PROTECTED]> wrote: > > > > yet another thing: what is the canonical 'pasky way' of simply nuking >

Re: Git hangs while executing commit-tree

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 11:28:35PM CEST, I got a letter where Rhys Hardwick <[EMAIL PROTECTED]> told me that... > Hey, Hi, > [EMAIL PROTECTED]:~/repo/tmp.repo$ commit-tree > c80156fafbac377ab35beb076090c8320f874f91 > Committing initial tree c80156fafbac377ab35beb076090c8320f874f91 >

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 11:19:19PM CEST, I got a letter where Greg KH <[EMAIL PROTECTED]> told me that... > On Wed, Apr 20, 2005 at 10:56:33PM +0200, Petr Baudis wrote: > > The short command version will change from 'git' to 'cg', which should >

Re: [ANNOUNCEMENT] /Arch/ embraces `git'

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:00:36PM CEST, I got a letter where Tom Lord <[EMAIL PROTECTED]> told me that... > >From the /Arch/ perspective: `git' technology will form the > basis of a new archive/revlib/cache format and the basis > of new network transports. I think one thing git's obje

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 12:09:06AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > Yeah, yeah, it looks different from "cvs update", but dammit, wouldn't it > be cool to just write "cg-" and see the command choices? Or > "cg-up" and get cg-update done f

Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I

2005-04-20 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 01:06:09AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > After getting the latest tarball, and make, make install: > > Tree change: > 55f9d5042603fff4ddfaf4e5f004d2995286d6d3:a46844fcb6afef1f7a2d93f391c82f08ea31 > *100755->100

Re: [PATCH] gittrack.sh accepts invalid branch names

2005-04-20 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 09:48:30PM CEST, I got a letter where Pavel Roskin <[EMAIL PROTECTED]> told me that... > --- a/gittrack.sh > +++ b/gittrack.sh > @@ -35,7 +35,7 @@ die () { > mkdir -p .git/heads > > if [ "$name" ]; then > - grep -q $(echo -e "^$name\t" | sed 's/\./\\./g')

Re: [PATCH] Add help details to git help command. (This time with Perl)

2005-04-20 Thread Petr Baudis
Dear diary, on Tue, Apr 19, 2005 at 09:04:16PM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > I don't love the 'require gitadd.pl' but it's a gradual start... I hate it, for one. ;-) > Cogito.pm seems to be a good place for the library stuff. Sounds sensible. > g

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-20 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 06:28:34AM CEST, I got a letter where Daniel Jacobowitz <[EMAIL PROTECTED]> told me that... > On Wed, Apr 20, 2005 at 09:00:44PM -0700, Linus Torvalds wrote: > > > > > > On Wed, 20 Apr 2005, Daniel Jacobowitz wrote: > > > > > > My logic: it's a lot more intuit

Re: Possible problem with git-pasky-0.6.2 (patch: **** Only garbage was found in the patch input.)I

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 02:20:27AM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Actually, I meant "patch -p1 But before doing that, I did a fsck-cache as follows, with these results. > This seems damaged. > > [EMAIL PROTECTED] git-pasky-0.6.2]$ fsck-cac

Re: Switching between branches

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 03:42:39AM CEST, I got a letter where Pavel Roskin <[EMAIL PROTECTED]> told me that... > Hello! Hello, > Perhaps it's a naive question, but how do I switch between branches? I > mean an equivalent of "svn switch" or "cvs update -r branch" that would > reuse th

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 04:53:33AM CEST, I got a letter where Bryan Donlan <[EMAIL PROTECTED]> told me that... > Fast-forwarding 55f9d5042603fff4ddfaf4e5f004d2995286d6d3 -> > 7a4c67965de68ae7bc7aa1fde33f8eb9d8114697 > on top of 55f9d5042603fff4ddfaf4e5f004d2995286d6d3... > patch:

Re: [PATCH] Allow "git cancel" to change branches

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 03:31:24PM CEST, I got a letter where Matthias Urlichs <[EMAIL PROTECTED]> told me that... > "git cancel" may not be named correctly for this job, but it does almost > everything you'd need for switching between one branch and another > within a repository, so...

Re: Errors received during git pull from linux-2.6.git, but resulting kernel looks OK.

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 03:55:26PM CEST, I got a letter where Steven Cole <[EMAIL PROTECTED]> told me that... > Executive summary: I received some alarming errors while doing > a git pull of the latest kernel from kernel.org, but it appears > that all is well. Continue reading for the

Re: [PATCH] Missing linefeeds

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 02:44:30PM CEST, I got a letter where Matthias Urlichs <[EMAIL PROTECTED]> told me that... > This patch fixes die() and error() to print linefeeds after the message. Why? report() already prints linefeed. -- Petr "Pasky" Baudis

Re: [PATCH] Improve usage messages

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 02:41:52PM CEST, I got a letter where Matthias Urlichs <[EMAIL PROTECTED]> told me that... > This patch adds somewhat-improved usage messages to some of Linus' programs. > Specifically, they now handle -? / --help. -? is pretty non-standard. Any problem with goi

Re: Switching between branches

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 04:12:49PM CEST, I got a letter where Matthias Urlichs <[EMAIL PROTECTED]> told me that... > Hi, Petr Baudis wrote: > > > Hello, > > > >> Perhaps it's a naive question, but how do I switch between branches? I > >

Re: [ANNOUNCE] git-pasky-0.6.2 && heads-up on upcoming changes

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 04:21:00PM CEST, I got a letter where Edgar Toernig <[EMAIL PROTECTED]> told me that... > Petr Baudis wrote: > > > > A little off-topic, anyone knows how to turn off that damn alternate > > screen thing on the xterm level? (Or any ot

Re: git-viz tool for visualising commit trees

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 04:47:16PM CEST, I got a letter where Ingo Molnar <[EMAIL PROTECTED]> told me that... > > is the 'diff with ancestor' feature supposed to work at this early > stage? (it just does nothing when i click on it. It correctly offers two > ancestors for merge points

Re: Linux 2.6.12-rc3

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 09:00:09PM CEST, I got a letter where Pavel Machek <[EMAIL PROTECTED]> told me that... > Hi! Hi, > > > Well, not sure. > > > > > > I did > > > > > > git track linus > > > git cancel > > > > > > but Makefile still contains -rc2. (Is "git cancel" right way to

Re: Pasky problem with 'git init URL'

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 06:21:58PM CEST, I got a letter where Martin Schlemmer <[EMAIL PROTECTED]> told me that... > Hi, Hi, > Just pulled linux-2.6.git, and got this: > > > New branch: 3a6fd752a50af92765853879f4a11cc0cfcd0320 > Tracked branch, applying changes... > Merging 4d78

Re: [PATCH] Add "git push"

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 02:43:33PM CEST, I got a letter where Matthias Urlichs <[EMAIL PROTECTED]> told me that... > This patch adds the ability to "git push", as the obvious converse of > "git pull". While lack of locking is a problem for git-pasky too, for this git push it is a downr

Re: [PATCH] Docs update

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 10:40:44PM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > @@ -156,3 +317,23 @@ > unpack-file > unpack-file.c > > + > + > +git Environment Variables > +GIT_CACHE_DIRECTORY > +AUTHOR_NAME > +AUTHOR_EMAIL > +AUTHOR_DATE > +R

Re: [PATCH] Docs update

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 11:16:11PM CEST, I got a letter where David Greaves <[EMAIL PROTECTED]> told me that... > Petr Baudis wrote: > > > >Make a choice - either you are describing git or Cogito. The frmer has > >no RSYNC_FLAGS and does not care about any he

Re: Pasky problem with 'git init URL'

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 11:15:54PM CEST, I got a letter where John Stoffel <[EMAIL PROTECTED]> told me that... > >>>>> "Petr" == Petr Baudis <[EMAIL PROTECTED]> writes: > > Petr> Perhaps it would be useful to have some "command c

Re: Linux 2.6.12-rc3

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 11:38:11PM CEST, I got a letter where Pavel Machek <[EMAIL PROTECTED]> told me that... > Hi! > > It seems that someone should write "Kernel hacker's guide to > git"... Documentation/git.txt seems like good place. I guess I'll do > it. I've also started writing

Re: Colorized git log

2005-04-21 Thread Petr Baudis
Dear diary, on Thu, Apr 21, 2005 at 11:12:45PM CEST, I got a letter where Sean <[EMAIL PROTECTED]> told me that... > On the off chance that someone else might like it, here is a pager script > for the git log that adds a splash of color: Actually, I would've never expected that I would like it, bu

Re: ia64 git pull

2005-04-21 Thread Petr Baudis
Dear diary, on Fri, Apr 22, 2005 at 12:29:07AM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > On Thu, 21 Apr 2005 [EMAIL PROTECTED] wrote: > > > > I can't quite see how to manage multiple "heads" in git. I notice that in > > your tree on kernel.org that .git/HEAD

Re: [PATCH] Colorized git log

2005-04-21 Thread Petr Baudis
Dear diary, on Fri, Apr 22, 2005 at 02:46:19AM CEST, I got a letter where Daniel Serpell <[EMAIL PROTECTED]> told me that... > Hi! Hi, > On 4/21/05, Petr Baudis <[EMAIL PROTECTED]> wrote: > > > > I made git log colorized if you pass it -c in current git-pasky. &

Re: ia64 git pull

2005-04-21 Thread Petr Baudis
Dear diary, on Fri, Apr 22, 2005 at 03:48:35AM CEST, I got a letter where Inaky Perez-Gonzalez <[EMAIL PROTECTED]> told me that... > >>>>> Petr Baudis <[EMAIL PROTECTED]> writes: > > > I've just added to git-pasky a possibility to refer to branc

Re: [PATCH] git-pasky spec file

2005-04-21 Thread Petr Baudis
Dear diary, on Fri, Apr 22, 2005 at 03:55:21AM CEST, I got a letter where Chris Wright <[EMAIL PROTECTED]> told me that... > Here's a simple spec file to do rpm builds. It's against the > latest Makefile (which has the s/BINDIR/bindir/ change). I've used > DESTDIR, although it's not clear it's me

[ANNOUNCE] git-pasky-0.6.3 && request for testing

2005-04-21 Thread Petr Baudis
Hello, FYI, I've released git-pasky-0.6.3 earlier in the night. It brings especially plenty of bugfixes, but also some tiny enhancements, like colored log and ability to pick branch in the remote repository. git log and git patch now also accept range of commits, so e.g. if you do git

<    1   2   3   4   >