Re: [PATCH] Trapping exit in tests, using return for errors

2005-08-11 Thread Junio C Hamano
Pavel Roskin [EMAIL PROTECTED] writes: This patch does following: All instances of exit, exit 1 and (exit 1) in tests have been replaced with return 1. In fact, (exit 1) had no effect. Are you sure about all of the above? You are right about ... || exit in the expect_success tests; they

Re: [PATCH] Trapping exit in tests, using return for errors

2005-08-11 Thread Junio C Hamano
Sorry, sent it out without finishing. The worst is return. With ksh, ash, and dash, the script itself exits with status code 1 (presumably you are trapping it with trap -- exit, though). prompt$ bash k.sh exit foo prompt$ bash k.sh false foo status 1 prompt$ bash k.sh return foo k.sh: line 20:

Re: [PATCH] Trapping exit in tests, using return for errors

2005-08-11 Thread Junio C Hamano
Junio C Hamano [EMAIL PROTECTED] writes: Sorry, sent it out without finishing. The worst is return. Ah, my mistake. You have the eval that can eval return in a function and let that return return from that function. Cleverly done. Thanks. - To unsubscribe from this list: send the line

[PATCH] update Debian packaging for cogito

2005-08-11 Thread Matthias Urlichs
Cleaned up Debian files. Conflict with cgvg instead of not installing cg. Pass prefix=/usr to make install. --- diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +cogito (0.13-1) stable; urgency=low + + * New version. + * Cleaned up

Re: [PATCH] Trapping exit in tests, using return for errors

2005-08-11 Thread Pavel Roskin
Hi, Junio! On Wed, 2005-08-10 at 23:31 -0700, Junio C Hamano wrote: Junio C Hamano [EMAIL PROTECTED] writes: Sorry, sent it out without finishing. The worst is return. Ah, my mistake. You have the eval that can eval return in a function and let that return return from that function.

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Matthias Urlichs
Hi, Sebastian Kuzminsky wrote: People still use GNU Interactive Tools. Not just crazy, stupid people, and I bet not just Debian people. Possibly. But the number of people running both git and git are, I'd bet, smaller than those who will send annoying emails when they install git and can't

gitk: integer overflow

2005-08-11 Thread Matthias Urlichs
Run gitk on the kernel archive, wait for it to finish reading commit changesets, scroll to the middle, and watch all the pretty (NOT) superfluous vertical lines appear and disappear pseudo-randomly. Looks like something in there (TK or even X11, most likely) cuts off screen coordinates after 16

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Linus Torvalds
On Wed, 10 Aug 2005, Sebastian Kuzminsky wrote: People still use GNU Interactive Tools. Not just crazy, stupid people, and I bet not just Debian people. Why do you say that? Do you have anybody who actually does, or are you just claiming so? Some distributions seems to disagree with you.

Re: [PATCH] Teach git push .git/branches shorthand

2005-08-11 Thread Matthias Urlichs
Hi, Josef Weidendorfer wrote: My understanding of .git/branches was that Cogito uses this as mapping of remote branches/heads to local branches/refs, and not to store shortcuts for remote git repositories. That seems to be the case, yes. I'd argue that the shortcut idea is inherently more

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Sebastian Kuzminsky
Linus Torvalds [EMAIL PROTECTED] wrote: On Wed, 10 Aug 2005, Sebastian Kuzminsky wrote: People still use GNU Interactive Tools. Not just crazy, stupid people, and I bet not just Debian people. Why do you say that? Do you have anybody who actually does, or are you just claiming so?

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Junio C Hamano
Linus Torvalds [EMAIL PROTECTED] writes: On Wed, 10 Aug 2005, Sebastian Kuzminsky wrote: People still use GNU Interactive Tools. Not just crazy, stupid people, and I bet not just Debian people. Why do you say that? Do you have anybody who actually does, or are you just claiming so?

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Sam Ravnborg
Anyway, enough of this. I understand the name will not change and I'm ok with that. I'll deal with it on our (Debian's) end. The easy fix is to kill the small git script that is not mandatory anyway (as far as my quick grep told me). The cg script has a bit more value. Sam - To

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Sebastian Kuzminsky
Sam Ravnborg [EMAIL PROTECTED] wrote: Anyway, enough of this. I understand the name will not change and I'm ok with that. I'll deal with it on our (Debian's) end. The easy fix is to kill the small git script that is not mandatory anyway (as far as my quick grep told me). The cg

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Matthias Urlichs
Hi, Sam Ravnborg: Anyway, enough of this. I understand the name will not change and I'm ok with that. I'll deal with it on our (Debian's) end. The easy fix is to kill the small git script that is not mandatory anyway (as far as my quick grep told me). I'd vote to keep the scripts in

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Sam Ravnborg
On Thu, Aug 11, 2005 at 10:24:10PM +0200, Matthias Urlichs wrote: Hi, Sam Ravnborg: Anyway, enough of this. I understand the name will not change and I'm ok with that. I'll deal with it on our (Debian's) end. The easy fix is to kill the small git script that is not mandatory

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Matthias Urlichs
Hi, Sebastian Kuzminsky: The cg script has a bit more value. Tried that too, and I got the bug reports to prove it. ;-) Another possible solution: Rename git's git to X and install ours as Y. Ask the user which should be symlinked to /usr/bin/git, if both are installed, via the existing

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Sebastian Kuzminsky
Matthias Urlichs [EMAIL PROTECTED] wrote: Another possible solution: Rename git's git to X and install ours as Y. Ask the user which should be symlinked to /usr/bin/git, if both are installed, via the existing alternatives system. I suggested this on debian-devel, and was told that

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Gene Heskett
On Thursday 11 August 2005 15:11, Junio C Hamano wrote: Linus Torvalds [EMAIL PROTECTED] writes: On Wed, 10 Aug 2005, Sebastian Kuzminsky wrote: People still use GNU Interactive Tools. Not just crazy, stupid people, and I bet not just Debian people. Why do you say that? Do you have anybody

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Linus Torvalds
On Thu, 11 Aug 2005, Sebastian Kuzminsky wrote: What I have is bug reports against the cogito package, from people who want to install both. The reports came very soon after I released the package, so I dont think it's a totally freak occurance. The point is, people have the thing

Re: cogito - how to drop a commit

2005-08-11 Thread Petr Baudis
Dear diary, on Sun, Aug 07, 2005 at 12:34:36AM CEST, I got a letter where Sam Ravnborg [EMAIL PROTECTED] told me that... I accidently commited too many files to my tree today, and now I want to drop the commit so I have logically separate commits. What is the right way to do this - in cogito

Re: bisect gives strange answer

2005-08-11 Thread Junio C Hamano
Sanjoy Mahajan [EMAIL PROTECTED] writes: I'm having doing a stupidity with git, but here's what is confusing me about using bisect: If I start with a clean directory except for a 2.6 .git/ (where master = d95a1b4818f2fe38a3cfc9a7d5817dc9a1a69329), then do $ cd linux-2.6 $ ls $ cat

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Alan Chandler
Matthias Urlichs wrote: A small Debian-specific patch to rename the offending scripts (and drop the Conflicts: entries) is cheap. Not sure I understand the proper use of dpkg-divert in Debian, but could _this_ git-core package perhaps ask the user which set of the two packages he wish to

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Sebastian Kuzminsky
Alan Chandler [EMAIL PROTECTED] wrote: Matthias Urlichs wrote: A small Debian-specific patch to rename the offending scripts (and drop the Conflicts: entries) is cheap. Not sure I understand the proper use of dpkg-divert in Debian, but could _this_ git-core package perhaps ask the user

Re: A simple script to do the reverse of git-push

2005-08-11 Thread Petr Baudis
Dear diary, on Tue, Aug 09, 2005 at 12:42:36AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... Johannes Schindelin [EMAIL PROTECTED] writes: BTW, if you are lazy, like me, you just pull from Junio once in a while and do a make test. Turns out there is a missing

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Junio C Hamano
Gene Heskett [EMAIL PROTECTED] writes: rank nameinstvote old recent 6591 git 114 24 83 7 2 git-core 2 1 0 1 (Not in sid) 29939 cogito-scm 1 0 1 0 (Not in sid) This obviously

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Christian Meder
On Thu, 2005-08-11 at 16:20 -0600, Sebastian Kuzminsky wrote: Linus Torvalds [EMAIL PROTECTED] wrote: Hands up people. Does anybody _use_ GNU interactive tools? None of this I have a package crap. Obviously no one on the git list uses GNU Interactive Tools, or this problem would have

Re: [PATCH] Debian packaging for 0.99.4

2005-08-11 Thread Matthias Urlichs
Hi, Linus Torvalds: Hands up people. Does anybody _use_ GNU interactive tools? None of this I have a package crap. You're preaching to the converted here. The Debian-package-for-Debian could pop up a notice asking the user to symlink /usr/local/bin/git = /usr/bin/gitscm (or whatever) if

Re: git-http-pull broken in latest git

2005-08-11 Thread Junio C Hamano
Petr Baudis [EMAIL PROTECTED] writes: $ git-cat-file commit bf570303153902ec3d85570ed24515bcf8948848 | grep tree tree 41f10531f1799bbb31a1e0f7652363154ce96f45 $ git-read-tree 41f10531f1799bbb31a1e0f7652363154ce96f45 fatal: failed to unpack tree object 41f10531f1799bbb31a1e0f7652363154ce96f45

[PATCH] Re: git-http-pull broken in latest git

2005-08-11 Thread Daniel Barkalow
On Thu, 11 Aug 2005, Junio C Hamano wrote: Petr Baudis [EMAIL PROTECTED] writes: $ git-cat-file commit bf570303153902ec3d85570ed24515bcf8948848 | grep tree tree 41f10531f1799bbb31a1e0f7652363154ce96f45 $ git-read-tree 41f10531f1799bbb31a1e0f7652363154ce96f45 fatal: failed to unpack

Re: New script: cg-clean

2005-08-11 Thread Pavel Roskin
Hi, Petr! Unfortunately, my latest revision of cg-clean has committed suicide just when I was about to post it. Anyway, I would prefer to wait until you apply my patch to cg-status to ignore all ignores. That would allow me to reuse cg-status. On Fri, 2005-08-12 at 01:29 +0200, Petr Baudis

Re: New script: cg-clean

2005-08-11 Thread Petr Baudis
Dear diary, on Fri, Aug 12, 2005 at 02:54:13AM CEST, I got a letter where Pavel Roskin [EMAIL PROTECTED] told me that... Hi, Petr! Hi, Unfortunately, my latest revision of cg-clean has committed suicide just when I was about to post it. Anyway, I would prefer to wait until you apply my

[PATCH] merge-base.c: pathological case fix.

2005-08-11 Thread Junio C Hamano
Also add some illustration requested by Linus. Signed-off-by: Junio C Hamano [EMAIL PROTECTED] --- merge-base.c | 74 +- 1 files changed, 68 insertions(+), 6 deletions(-) 5cbb01b3bb1828759596bff71e16cfcee798491c diff --git

Re: [PATCH] Re: git-http-pull broken in latest git

2005-08-11 Thread Junio C Hamano
Daniel Barkalow [EMAIL PROTECTED] writes: It should work anyway,... That is true. Please forget about the recommendation to slurp packs and not falling back on commit walker. Thanks for the patch. - To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH] Re: git-http-pull broken in latest git

2005-08-11 Thread Daniel Barkalow
On Thu, 11 Aug 2005, Junio C Hamano wrote: Daniel Barkalow [EMAIL PROTECTED] writes: It should work anyway,... That is true. Please forget about the recommendation to slurp packs and not falling back on commit walker. Thanks for the patch. No problem; I had been wondering what the

Re: git-http-pull broken in latest git

2005-08-11 Thread Petr Baudis
Dear diary, on Fri, Aug 12, 2005 at 01:21:46AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... Petr Baudis [EMAIL PROTECTED] writes: $ git-cat-file commit bf570303153902ec3d85570ed24515bcf8948848 | grep tree tree 41f10531f1799bbb31a1e0f7652363154ce96f45 $

Re: [PATCH] merge-base.c: pathological case fix.

2005-08-11 Thread Junio C Hamano
I wrote: + * F + * / \ + *E A D + * \ / / + * B / + * \ / + *C + * + * First we push E and F to list to be processed. E gets bit 1 + * and F gets bit 2. The list becomes: + *