Re: [PATCH] git stash: Avoid data loss when saving a stash

2013-07-06 Thread Petr Baudis
Hi! (tl;dr - I disagree but this issue is perhaps not so important in practice) On Sun, Jun 30, 2013 at 12:14:26PM -0700, Junio C Hamano wrote: I do not agree with your `git reset --hard` at all. With the command, the user demands no matter what, I want get rid of any funny state in my

Re: [PATCH] git stash: Avoid data loss when saving a stash

2013-06-30 Thread Petr Baudis
: Petr Baudis pa...@ucw.cz Date: Fri, 28 Jun 2013 17:05:32 +0200 Subject: [PATCH] git stash: avoid data loss when git stash save kills a directory Hmm, it's a pity that the note that `git reset --hard` itself should perhaps also abort in that case got lost. I don't insist on mentioning

[PATCH] git stash: Avoid data loss when saving a stash

2013-06-28 Thread Petr Baudis
to never fail in ordinary circumstances (see e.g. git-stash code ;-) and I'm unable to devote sufficient effort to seeing such a change through. Signed-off-by: Petr Baudis pa...@ucw.cz --- Please Cc me, I'm currently not subscribed on the list. Documentation/git-stash.txt | 12 ++-- git

Re: git stash deletes/drops changes of

2013-05-24 Thread Petr Baudis
On Fri, May 24, 2013 at 09:22:53AM +0100, John Keeping wrote: On Fri, May 24, 2013 at 01:57:12AM +0200, Petr Baudis wrote: Just to clear up on what the best practice is, I'd imagine the setup to be something like: (a) Makefile contains inclusion of Makefile.include. (b

Re: git stash deletes/drops changes of

2013-05-24 Thread Petr Baudis
On Fri, May 24, 2013 at 11:06:12AM +0100, John Keeping wrote: I don't see anything wrong with having a template file documenting the parameters, but I think it's important that there are sensible defaults in place when the user's configuration file does not specify a value for a parameter. It

Re: git stash deletes/drops changes of

2013-05-24 Thread Petr Baudis
On Fri, May 24, 2013 at 11:40:18AM +0100, John Keeping wrote: So that it continues to Just Work for people using buildroot but you can create Makefile.config to override those defaults. Indeed, that doesn't cover some corner cases of (c), but that's not a big deal in practice I guess. My

Re: git stash deletes/drops changes of

2013-05-23 Thread Petr Baudis
Hi! On Fri, May 24, 2013 at 12:56:50AM +0200, Thomas Rast wrote: It is not --ignore-changes bit, and has never been. Indeed, it has been my lack of imagination regarding what can go wrong. I am fine with the changes not being shown in `git diff` and even not so worried about them being

Re: [PATCH v2 1/2] perl: redirect stderr to /dev/null instead of closing

2013-04-06 Thread Petr Baudis
On Sat, Apr 06, 2013 at 10:07:40AM +0200, Thomas Rast wrote: The manpage for dup2 does, however, say If newfd was open, any errors that would have been reported at close(2) time are lost. A careful programmer will not use dup2() or dup3() without closing newfd first. which

Re: [PATCH v2 1/2] perl: redirect stderr to /dev/null instead of closing

2013-04-05 Thread Petr Baudis
Hi! On Thu, Apr 04, 2013 at 10:41:41PM +0200, Thomas Rast wrote: As pointed out by Eric Wong (thanks), the initial close needs to go: die() would again write nowhere if we close STDERR beforehand. Perhaps we should also do the following: --- a/perl/Git.pm +++ b/perl/Git.pm @@

Re: [PATCH] update pasky's email address

2013-04-04 Thread Petr Baudis
Hi! On Thu, Apr 04, 2013 at 01:50:42AM +, Eric Wong wrote: Mail to pa...@suse.cz is bouncing. Oh, I totally forgot to take care of this. Thanks a lot for fixing it! Signed-off-by: Eric Wong normalper...@yhbt.net In general, Acked-by: Petr Baudis pa...@ucw.cz On Thu, Apr 04, 2013

Re: cg-update (cogito-0.13) bug: changed heads

2005-09-06 Thread Petr Baudis
Dear diary, on Tue, Sep 06, 2005 at 11:01:25PM CEST, I got a letter where H. Peter Anvin [EMAIL PROTECTED] told me that... I just found a bug in cogito-0.13, at least to the best of my understanding of the situation. Simplified, the problem looks like this: two sides, A and B, pull from

Re: Cogito Petr dormant?

2005-08-30 Thread Petr Baudis
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 on

Re: sending changesets from the middle of a git tree

2005-08-14 Thread Petr Baudis
Dear diary, on Sun, Aug 14, 2005 at 09:57:13AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... Linus Torvalds [EMAIL PROTECTED] writes: Alternatively, use git cherry, which helps re-order the commits in your tree. They'll be _new_ commits, but they'll have the

Re: git/cogito workshop/bof at linuxconf au?

2005-08-14 Thread Petr Baudis
Dear diary, on Sun, Aug 14, 2005 at 01:33:53AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Sun, 14 Aug 2005, Martin Langhoff wrote: And how are things lining up for the upcoming one (January 2006, Dunedin, NZ)? Dunno yet. I have a policy of trying

Re: Fwd: Re: git checkout -f branch doesn't remove extra files

2005-08-13 Thread Petr Baudis
Dear diary, on Sat, Aug 13, 2005 at 07:05:11AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... If you really want a temporary tree, what you do is something like git-checkout-cache --prefix=tmp-dir/ -f -a and when you're done, you just do rm -rf

Re: [PATCH] Alternate object pool mechanism updates.

2005-08-13 Thread Petr Baudis
Dear diary, on Sat, Aug 13, 2005 at 11:09:13AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... It was a mistake to use GIT_ALTERNATE_OBJECT_DIRECTORIES environment variable to specify what alternate object pools to look for missing objects when working with an object

Re: Merge conflict.

2005-08-13 Thread Petr Baudis
Dear diary, on Sat, Aug 13, 2005 at 04:45:32PM CEST, I got a letter where Kenneth Johansson [EMAIL PROTECTED] told me that... I used cogito to do a cg-update and got conflicts and the exact files are printed to the screen. But say I somehow lost that output is there anyway to list conflicting

Re: Add an empty directory?

2005-08-13 Thread Petr Baudis
Dear diary, on Sat, Aug 13, 2005 at 09:41:45PM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Sat, 13 Aug 2005, Carl Baldwin wrote: The bottom line is that I don't really see many situations where it is absolutely necessary but it is a convenience. Not

Re: My Itchlist

2005-08-13 Thread Petr Baudis
Dear diary, on Sat, Aug 06, 2005 at 04:39:01AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Fri, 5 Aug 2005, Junio C Hamano wrote: - teach git-apply reverse and possibly fuzz. I think this might help Porcelain; currently they have to interpret git

[RFC][PATCH] Rewriting revs in place in push target repository

2005-08-13 Thread Petr Baudis
; will the system ever be evil enough to truncate the file, then decide the user is over his quota and not write the new contents? Signed-off-by: Petr Baudis [EMAIL PROTECTED] diff --git a/receive-pack.c b/receive-pack.c --- a/receive-pack.c +++ b/receive-pack.c @@ -92,13 +92,7

Re: [PATCH] Use -script postfix for scripts

2005-08-13 Thread Petr Baudis
Dear diary, on Sun, Aug 14, 2005 at 12:25:12AM CEST, I got a letter where Ryan Anderson [EMAIL PROTECTED] told me that... Honestly, I think the biggest argument against the -script suffix is related to man-page usage: It requires significant knowledge of the Git project to figure out what name

[PATCH] Fix documentation installation

2005-08-12 Thread Petr Baudis
since building HTML might cause problems on some asciidoc installations (like, well, mine) as xhtml11 appears not to be an official asciidoc plugin, or so asciidoc claims. The missing dependency was pointed out by Jonas Fonseca. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- commit

Re: [PATCH] Fix documentation installation

2005-08-12 Thread Petr Baudis
Dear diary, on Fri, Aug 12, 2005 at 11:11:45PM CEST, I got a letter where Petr Baudis [EMAIL PROTECTED] told me that... diff --git a/tools/Makefile b/tools/Makefile --- a/tools/Makefile +++ b/tools/Makefile @@ -18,7 +18,7 @@ git-%: %.c all: $(PROGRAMS) install: $(PROGRAMS) $(SCRIPTS

Cloning speed comparison

2005-08-12 Thread Petr Baudis
Hello, I've wondered how slow the protocols other than rsync are, and the (well, a bit dubious; especially wrt. caching on the remote side) results are: git clone-pack:ssh 25s git rsync 27s git http-pull 47s git dumb-http

Re: Cloning speed comparison

2005-08-12 Thread Petr Baudis
Dear diary, on Sat, Aug 13, 2005 at 04:12:26AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Sat, 13 Aug 2005, Petr Baudis wrote: Anyway, clone-pack is a clear winner for networks (but someone should re-check that, especially compared to rsync, wrt

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: 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: New script: cg-clean

2005-08-11 Thread Petr Baudis
patch to cg-status to ignore all ignores. That would allow me to reuse cg-status. well, I did quite a while ago. Unless the kernel.org mirroring system broke, it should be already public. On Fri, 2005-08-12 at 01:29 +0200, Petr Baudis wrote: Here's the simplified cg-clean script. Note

Re: Template files location

2005-08-09 Thread Petr Baudis
Dear diary, on Fri, Aug 05, 2005 at 07:33:02PM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... *2* And I am sure many others shared the same objection but did not even bother to say anything because what Johannes said made a lot of sense and what the patch did was

Re: [PATCH] Use $DESTDIR instead of $dest

2005-08-09 Thread Petr Baudis
Dear diary, on Sat, Aug 06, 2005 at 01:17:17AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... Petr Baudis [EMAIL PROTECTED] writes: $DESTDIR is more usual during the build than $dest and is what is usually used in the makefiles, so let's use it too. While I

Re: [ANNOUNCE] Cogito-0.13

2005-08-06 Thread Petr Baudis
Dear diary, on Fri, Aug 05, 2005 at 07:49:37PM CEST, I got a letter where Dirk Behme [EMAIL PROTECTED] told me that... Hi Petr, Petr Baudis wrote: I'm happy to announce release 0.13 of the Cogito SCMish layer over the GIT Tree History Storage tool. As usual, get it at: http

Template files location

2005-08-05 Thread Petr Baudis
Dear diary, on Fri, Aug 05, 2005 at 06:37:11AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... We install files in $(HOME)/etc/git-core/templates/ directory. In the standard binary distribution scheme, it should probably go to either /usr/share or /etc; the former

Re: [PATCH] daemon.c: squelch error message from EINTR

2005-08-04 Thread Petr Baudis
Dear diary, on Wed, Aug 03, 2005 at 08:20:01AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... I am not sure if this is the right fix, and I have not received an answer from the original author of the patch. I would appreciate help from the folks on the list who are

Re: cogito missing asciidoc.conf?

2005-08-04 Thread Petr Baudis
Dear diary, on Wed, Aug 03, 2005 at 12:40:35AM CEST, I got a letter where Sebastian Kuzminsky [EMAIL PROTECTED] told me that... Or am I missing something? The most recent commit to cogito makes the documentation depend on asciidoc.conf, but it looks like the actual config file was not added.

[PATCH] Fix git-merge-cache -q

2005-08-04 Thread Petr Baudis
I'm totally stupid and got it backwards, sorry about that. git-merge-cache -q would mean it's noisy and quiet without any parameters. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- commit 1d86b5cb68dd47b4fced8343945c8860946df5d2 tree 25c4f9cabd6db8c92ab1b0313093d898c03b2b7a parent

[PATCH] Unify Makefile indentation

2005-08-04 Thread Petr Baudis
Use tab instead of two spaces uniformly in the Makefile, even in the ifdefs. Gives it a nice consistent look. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- commit aa6f095b0cd57ab424f02695ccfc8168f5c3b981 tree 046906d724925998ec7f47efc26bab7e84052014 parent

Re: [PATCH 2/3] conditional makefile vars

2005-08-04 Thread Petr Baudis
Dear diary, on Mon, Aug 01, 2005 at 10:44:02PM CEST, I got a letter where Holger Eitzenberger [EMAIL PROTECTED] told me that... Hi, Hi, please see the notes of my first email, thx. I don't know. Is this really a good idea? The names are lowercase and may be whatever mess some build scripts or

Re: Can't build RPM's from current cogito tree

2005-08-04 Thread Petr Baudis
Dear diary, on Thu, Aug 04, 2005 at 10:47:19PM CEST, I got a letter where Wolfgang Denk [EMAIL PROTECTED] told me that... Building of RPM's from the current cogito tree fails: - rpmbuild -ba cogito.spec ... make -C tools install make[1]: Entering directory

[PATCH] Use $DESTDIR instead of $dest

2005-08-04 Thread Petr Baudis
$DESTDIR is more usual during the build than $dest and is what is usually used in the makefiles, so let's use it too. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- This updates the subdirectory Makefiles as well. commit aef274d1fc04d848c7355a68c3e48c0b2b5400cb tree

Re: garbage in the cogito.git repository

2005-08-04 Thread Petr Baudis
Dear diary, on Sun, Jul 31, 2005 at 02:42:28PM CEST, I got a letter where Sergey Vlasov [EMAIL PROTECTED] told me that... Hello! Hi, Today's pull from rsync://rsync.kernel.org/pub/scm/cogito/cogito.git downloaded more than 10 MB. It seems that the cogito.git repository currently contains

Re: garbage in the cogito.git repository

2005-08-04 Thread Petr Baudis
Dear diary, on Fri, Aug 05, 2005 at 02:06:13AM CEST, I got a letter where Petr Baudis [EMAIL PROTECTED] told me that... yes, sorry about this. Packs got there through rsyncs all the way from git-core, and my immediate naive git-unpack-objects didn't actually do anything since all the objects

Re: cg-clone failing to get cogito latest tree.

2005-08-04 Thread Petr Baudis
Dear diary, on Mon, Aug 01, 2005 at 04:49:37AM CEST, I got a letter where Martin Langhoff [EMAIL PROTECTED] told me that... On a new machine, trying to boostrap into latest cogito, I download and make cogito 0.12.1, and then... $ cg-clone http://www.kernel.org/pub/scm/cogito/cogito.git cogito

[RFC] git homepage

2005-08-04 Thread Petr Baudis
Hello, as I promised some time ago, I finally put together a simple GIT homepage proposal now available at: http://git.or.cz/ Basically, I took r3 of Ryan Anderson's synopsis, pruned and rewrote it a bit, added some hypertext and tried to very briefly cover the porcelain as well.

[ANNOUNCE] Cogito-0.13

2005-08-04 Thread Petr Baudis
Hi, I'm happy to announce release 0.13 of the Cogito SCMish layer over the GIT Tree History Storage tool. As usual, get it at: http://www.kernel.org/pub/software/scm/cogito Highlights: * Cogito is now alone! GIT is no longer part of Cogito distribution.

Re: [RFC] git homepage

2005-08-04 Thread Petr Baudis
Dear diary, on Fri, Aug 05, 2005 at 04:00:03AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... Petr Baudis [EMAIL PROTECTED] writes: http://git.or.cz/ Wonderful. Once the page contents stabilizes, it would be a good idea to get it added in the page top

Re: [PATCH 0/2] Bits from git-pb

2005-07-30 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 10:58:19AM CEST, I got a letter where Petr Baudis [EMAIL PROTECTED] told me that... (i) Keep the git-pb branch polished and nice-to-merge, if you want to pull from it. (ii) Keep the git-pb branch polished and nice-to-merge and rebase it regularily

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-07-29 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 04:24:40AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... Petr Baudis [EMAIL PROTECTED] writes: One of the Cogito design bits is that branch name is something local to the repository. When you are adding a branch, the local

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-07-29 Thread Petr Baudis
Dear diary, on Thu, Jul 28, 2005 at 10:14:35PM CEST, I got a letter where Johannes Schindelin [EMAIL PROTECTED] told me that... Hi, Hello, Naming the remote HEAD differently than the local HEAD is just *wrong* when you want to push back to them. But you might not know that in advance. That's

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-07-29 Thread Petr Baudis
Dear diary, on Thu, Jul 28, 2005 at 11:13:38PM CEST, I got a letter where Matthias Urlichs [EMAIL PROTECTED] told me that... Then, you'd kill porcelain writers who don't verify that the old head is a(n indirect) parent of the new one. ;-) send-pack.c: if (!ref_newer(new_sha1,

Re: [RFC] extending git-ls-files --exclude.

2005-07-29 Thread Petr Baudis
Dear diary, on Thu, Jul 28, 2005 at 09:25:45PM CEST, I got a letter where Matthias Urlichs [EMAIL PROTECTED] told me that... Hi, A Large Angry SCM wrote: So you're arguing for last match wins versus first match wins. I, personally, find the former more natural and easier to debug by hand.

Re: [PATCH/RFC] Recursive Make considered harmful

2005-07-29 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 09:31:34AM CEST, I got a letter where Sam Ravnborg [EMAIL PROTECTED] told me that... While I do not have strong objections to make the build process go faster, it is somewhat disturbing that the Makefile pieces maintained in subdirectories need to name

Re: [RFC] extending git-ls-files --exclude.

2005-07-29 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 10:24:54AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... In the meantime, the current one is clearly broken as you pointed out, so let's replace it with the updated generic rule with the following exceptions one. That's fine by

Re: cg-restore - restoring modified files

2005-07-29 Thread Petr Baudis
Umm. I just discovered a portion of mailing list I somehow completely missed. :/ Sorry for the delayed replies. Dear diary, on Wed, Jun 15, 2005 at 03:45:21AM CEST, I got a letter where Pavel Roskin [EMAIL PROTECTED] told me that... Hello! Hi, I believe the documented behavior of cg-restore

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-29 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 11:55:52AM CEST, I got a letter where Catalin Marinas [EMAIL PROTECTED] told me that... Petr Baudis [EMAIL PROTECTED] wrote: The committer field generally identifies the committer physically, and isn't usually overriden. You'll find [EMAIL PROTECTED] in my

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-07-29 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 02:26:51PM CEST, I got a letter where Johannes Schindelin [EMAIL PROTECTED] told me that... Hi, On Fri, 29 Jul 2005, Petr Baudis wrote: Dear diary, on Fri, Jul 29, 2005 at 12:57:50PM CEST, I got a letter where Johannes Schindelin [EMAIL PROTECTED] told

[PATCH 3/2] git-merge-cache -q doesn't complain about failing merge program

2005-07-29 Thread Petr Baudis
git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis [EMAIL

[PATCH 4/2] Improve the compilation-time settings interface

2005-07-29 Thread Petr Baudis
port. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- commit 601722751e42dfef8bcd2fe3d6b070b07eb9198e tree ebe576c5bd841b4daeb855e49635491c02a322b5 parent 8ddefe85adc8e035864be615c87844ef982f4bc6 author Petr Baudis [EMAIL PROTECTED] Fri, 29 Jul 2005 15:45:42 +0200 committer Petr Baudis [EMAIL

[PATCH 6/2] Reorder Makefile rules

2005-07-29 Thread Petr Baudis
The Makefile rules were massively reordered so that they are actually logically grouped now. Captions were added to separate the sections. No rule contents was touched during the process. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- commit 656a66fe63898954dbc40854dd049dc76eb9b841 tree

[PATCH 7/2] Support for NO_OPENSSL

2005-07-29 Thread Petr Baudis
, disabling --merge-order and using Mozilla's SHA1 implementation. Ported from Cogito. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- commit cd2182ac0e0635faeca6467b68decf8ab9625f4c tree d0c704c203d2319a77cd8fd9ee8fda8adc2d27b4 parent 656a66fe63898954dbc40854dd049dc76eb9b841 author Petr Baudis [EMAIL

[PATCH 8/2] Build commands through object files

2005-07-29 Thread Petr Baudis
Cogito. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- commit 02074521a74483bec941ceacea35f92b485ebd48 tree b08deb01bab982b846b5757943571d0c39b9ba76 parent cd2182ac0e0635faeca6467b68decf8ab9625f4c author Petr Baudis [EMAIL PROTECTED] Fri, 29 Jul 2005 19:20:28 +0200 committer Petr Baudis [EMAIL

Re: [PATCH 4/2] Improve the compilation-time settings interface

2005-07-29 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 05:48:26PM CEST, I got a letter where Petr Baudis [EMAIL PROTECTED] told me that... diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,33 +1,53 @@ +# Define NO_OPENSSL environment variable if you do not have OpenSSL. You will +# miss out

Re: Last mile to 1.0?

2005-07-29 Thread Petr Baudis
Dear diary, on Sat, Jul 16, 2005 at 07:46:00PM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... I do not know what release plan Linus has in mind, and also expect things to be quieter next week during OLS and kernel summit, but I think we are getting really really

Re: [PATCH/RFC] Recursive Make considered harmful

2005-07-28 Thread Petr Baudis
Dear diary, on Thu, Jul 28, 2005 at 12:07:07AM CEST, I got a letter where A Large Angry SCM [EMAIL PROTECTED] told me that... Junio C Hamano wrote: While I do not have strong objections to make the build process go faster, it is somewhat disturbing that the Makefile pieces maintained in

Re: [RFC] extending git-ls-files --exclude.

2005-07-28 Thread Petr Baudis
Dear diary, on Mon, Jul 25, 2005 at 10:27:36PM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... Linus Torvalds [EMAIL PROTECTED] writes: On Mon, 25 Jul 2005, Junio C Hamano wrote: I personally do not have preference either way, but am slightly biased towards

Re: How is working on arbitrary remote heads supposed to work in Cogito (+ PATCH)?

2005-07-28 Thread Petr Baudis
Dear diary, on Thu, Jul 28, 2005 at 05:56:21PM CEST, I got a letter where Johannes Schindelin [EMAIL PROTECTED] told me that... Hi, Hello, On Thu, 28 Jul 2005, Petr Baudis wrote: Dear diary, on Thu, Jul 28, 2005 at 03:07:01PM CEST, I got a letter where Johannes Schindelin [EMAIL

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-28 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 12:27:31PM CEST, I got a letter where Catalin Marinas [EMAIL PROTECTED] told me that... Agreed. What Cogito uses: .git/author Default author information in format Person Name [EMAIL PROTECTED] What about

Re: Should cg-mkpatch output be usable with cg-patch?

2005-07-24 Thread Petr Baudis
Dear diary, on Sun, Jul 24, 2005 at 07:50:18PM CEST, I got a letter where Wolfgang Denk [EMAIL PROTECTED] told me that... In message [EMAIL PROTECTED] you wrote: I wander what I should do with cg-mkpatch generated output; I had the impression that this should be usable with cg-patch,

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-23 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 10:41:38AM CEST, I got a letter where Catalin Marinas [EMAIL PROTECTED] told me that... Another problem with the template is when one wants a header as well as footer (for things like '-*- mode: text; -*-'). Maybe something like below would work: GIT: your

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 12:37:05PM CEST, I got a letter where Catalin Marinas [EMAIL PROTECTED] told me that... Cogito seems to use $GIT_DIR/commit-template for that purpose. Can't users put that vim: hint there, and if StGIT does not use a commit template, patch it to use the

Re: Should cg-mkpatch output be usable with cg-patch?

2005-07-22 Thread Petr Baudis
Dear diary, on Thu, Jul 21, 2005 at 05:57:49AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... I only briefly looked at cg-patch, but I suspect that it can lose 90% lines of its code by just using git-apply --index. Can git-apply already deal with fuzzy patches? --

Re: Should cg-mkpatch output be usable with cg-patch?

2005-07-22 Thread Petr Baudis
Dear diary, on Thu, Jul 21, 2005 at 01:49:04AM CEST, I got a letter where Wolfgang Denk [EMAIL PROTECTED] told me that... I wander what I should do with cg-mkpatch generated output; I had the impression that this should be usable with cg-patch, but these are incompatible with each other.

Re: [PATCH 2/2] GIT: Listen on IPv6 as well, if available.

2005-07-22 Thread Petr Baudis
Dear diary, on Thu, Jul 21, 2005 at 03:10:49PM CEST, I got a letter where YOSHIFUJI Hideaki / ?$B5HF#1QL@ [EMAIL PROTECTED] told me that... Hello. Hello from an IPv6 fan, Listen on IPv6 as well, if available. Signed-off-by: Hideaki YOSHIFUJI [EMAIL PROTECTED] diff --git a/daemon.c

Re: [PATCH 1/1] Tell vim the textwidth is 75.

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 11:16:51PM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... Wonderful start. Later on, Porcelains could agree on what @TOKEN@ are generally available, and even start using a common script to pre-fill the templates, like: $

Re: [PATCH 1/2] GIT: Try all addresses for given remote name

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 11:26:29PM CEST, I got a letter where YOSHIFUJI Hideaki / ?$B5HF#1QL@ [EMAIL PROTECTED] told me that... In article [EMAIL PROTECTED] (at Fri, 22 Jul 2005 23:09:13 +0200), Petr Baudis [EMAIL PROTECTED] says: -} +#define STR_(s) # s +#define STR(s

Re: [PATCH 2/2] GIT: Listen on IPv6 as well, if available.

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 11:35:17PM CEST, I got a letter where YOSHIFUJI Hideaki / ?$B5HF#1QL@ [EMAIL PROTECTED] told me that... In article [EMAIL PROTECTED] (at Fri, 22 Jul 2005 23:21:51 +0200), Petr Baudis [EMAIL PROTECTED] says: this whole getaddrinfo() magic looks horribly

Re: [PATCH] Make debian/rules executable, and correct the spelling of rsync in debian/control

2005-07-22 Thread Petr Baudis
Dear diary, on Wed, Jul 20, 2005 at 03:17:47AM CEST, I got a letter where Ryan Anderson [EMAIL PROTECTED] told me that... Make debian/rules executable, and correct the spelling of rsync in debian/control Any progress with applying of this one? Linus, do you want me to ack even trivial patches

Re: [PATCH 0/2] apply.c: a fix and an enhancement

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 11:53:41PM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Fri, 22 Jul 2005, Junio C Hamano wrote: And the file would obviously be per-project, so according to Pasky's suggestion that would be .gitinfo/fake_parents ;-).

Re: [PATCH 0/2] apply.c: a fix and an enhancement

2005-07-22 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 01:26:07AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Fri, 22 Jul 2005, Junio C Hamano wrote: Linus Torvalds [EMAIL PROTECTED] writes: I'd _really_ prefer to not have any preferences or other metadata files under

Re: [PATCH 0/2] apply.c: a fix and an enhancement

2005-07-22 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 01:50:09AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Sat, 23 Jul 2005, Petr Baudis wrote: Yes, but this stuff is not for personal preferences. It is for project-wide preferences and policies, which can be still

Re: [PATCH] Misc documentation fixes and improvements

2005-07-20 Thread Petr Baudis
in print_help(). Improve the asciidoc markup. Signed-off-by: Jonas Fonseca [EMAIL PROTECTED] --- diff --git a/cg-diff b/cg-diff --- a/cg-diff +++ b/cg-diff @@ -3,7 +3,7 @@ # Make a diff between two GIT trees. # Copyright (c) Petr Baudis, 2005 # -# Outputs a diff for converting the first

Re: Cannot get git any more?

2005-07-19 Thread Petr Baudis
Dear diary, on Mon, Jul 18, 2005 at 12:49:04AM CEST, I got a letter where Wolfgang Denk [EMAIL PROTECTED] told me that... - cd .. - mv git git.OLD - cg-clone rsync://rsync.kernel.org/pub/scm/git/git.git /usr/local/src/git defaulting to local storage area @ERROR: Unknown module 'pub' rsync:

Re: [ANNOUNCE] Cogito 0.12.1

2005-07-19 Thread Petr Baudis
Dear diary, on Wed, Jul 13, 2005 at 01:13:52PM CEST, I got a letter where Catalin Marinas [EMAIL PROTECTED] told me that... Russell King [EMAIL PROTECTED] wrote: I won't bother trying to explain, I'll just paste the errors. We've been here before in a previous cogito revision. [EMAIL

Re: [ANNOUNCE] Gct-0.1, a GUI enabled Git commit tool

2005-07-19 Thread Petr Baudis
Dear diary, on Fri, Jul 15, 2005 at 02:46:42AM CEST, I got a letter where Fredrik Kuivinen [EMAIL PROTECTED] told me that... Hi, Hello from a lazy reader who didn't actually try it, Gct v0.1 has been released and can be downloaded from http://www.cyd.liu.se/~freku045/gct/gct-0.1.tar.gz

Re: Why fetching latest kernel sources is failing?

2005-07-19 Thread Petr Baudis
Dear diary, on Wed, Jul 13, 2005 at 07:22:22PM CEST, I got a letter where Paolo \\'Blaisorblade\\' Giarrusso [EMAIL PROTECTED] told me that... cg-clone http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git Please use rsync, http is broken for the time being and not trivially

Re: Why is there no git-update-cache --modified (aka I give up)

2005-07-12 Thread Petr Baudis
Dear diary, on Tue, Jul 12, 2005 at 07:52:18AM CEST, I got a letter where Marc Singer [EMAIL PROTECTED] told me that... # git-diff-cache HEAD is really nice. But, do I really have to invoke git-update-cache with every modified file? I could write a script to cul the filenames from

Re: [PATCH] remove Obsoletes from cogito.spec.in

2005-07-12 Thread Petr Baudis
Dear diary, on Tue, Jul 12, 2005 at 02:33:45AM CEST, I got a letter where Chris Wright [EMAIL PROTECTED] told me that... This is leftover from early naming, and is no longer relevant. Signed-off-by: Chris Wright [EMAIL PROTECTED] Thanks, applied. BTW, Josh Boyer of Fedora suggested having the

Re: Bootstrapping into git, commit gripes at me

2005-07-12 Thread Petr Baudis
Dear diary, on Tue, Jul 12, 2005 at 06:34:33AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Mon, 11 Jul 2005, Linus Torvalds wrote: Of course, if you want to create a new branch my-branch and _not_ check it out, you could have done so with just

Re: [PATCH] tagger id

2005-07-12 Thread Petr Baudis
Dear diary, on Tue, Jul 12, 2005 at 05:04:23PM CEST, I got a letter where Eric W. Biederman [EMAIL PROTECTED] told me that... By the way, I do not particularly like the name git-id. There could be IDs for different kinds (not just people) we would want later (file IDs, for example). Naming

Re: arch 2.0 first source available (git related)

2005-07-11 Thread Petr Baudis
Dear diary, on Sat, Jul 09, 2005 at 04:20:13PM CEST, I got a letter where Thomas Lord [EMAIL PROTECTED] told me that... The prereq graph is, indeed, an improvement. ..snip.. But object retrieval can be potentially as much as linear to the depth of the prereq graph, right? I don't think any of

Re: arch 2.0 first source available (git related)

2005-07-11 Thread Petr Baudis
Dear diary, on Mon, Jul 11, 2005 at 11:36:56PM CEST, I got a letter where Thomas Lord [EMAIL PROTECTED] told me that... On Mon, 2005-07-11 at 21:39 +0200, Petr Baudis wrote: Dear diary, on Sat, Jul 09, 2005 at 04:20:13PM CEST, I got a letter where Thomas Lord [EMAIL PROTECTED] told me

Re: cogito clone, invalid cross-dev links

2005-07-11 Thread Petr Baudis
Dear diary, on Mon, Jul 11, 2005 at 10:44:45PM CEST, I got a letter where Marc Singer [EMAIL PROTECTED] told me that... It complained when I cloned across devices. `/git/cogito/.git/refs/tags/cogito-0.8' - `.git/refs/tags/cogito-0.8' cp: cannot create link `.git/refs/tags/cogito-0.8':

[ANNOUNCE] Cogito 0.12.1

2005-07-11 Thread Petr Baudis
Hello, here is Cogito 0.12.1, another desperate attempt to keep pace with '@' or Linus, the named Human Master Coder. (Linus, the Human Master Coder, mumbles arcane do { formulae } while (0)! Some kind of force seems to attack your mind. Everything suddenly looks so different... You are

Re: cogito Mac OS X compatibility

2005-07-10 Thread Petr Baudis
Dear diary, on Sat, Jul 09, 2005 at 01:34:55AM CEST, I got a letter where Bryan Larsen [EMAIL PROTECTED] told me that... On Mac OS X $ cg-clone http://www.kernel.org/pub/scm/cogito/cogito.git defaulting to local storage area 19:11:10

Re: [ANNOUNCE] Cogito-0.12

2005-07-10 Thread Petr Baudis
Dear diary, on Sun, Jul 10, 2005 at 10:09:14AM CEST, I got a letter where Russell King [EMAIL PROTECTED] told me that... On Sat, Jul 09, 2005 at 10:58:18PM +0100, Russell King wrote: $ mv .git/objects/pack/* .git/ $ for i in .git/*.pack; do git-unpack-objects $i; done Unpacking 55435

Re: Bootstrapping into git, commit gripes at me

2005-07-10 Thread Petr Baudis
Dear diary, on Sat, Jul 09, 2005 at 11:04:37PM CEST, I got a letter where Matthias Urlichs [EMAIL PROTECTED] told me that... o Is there a way to force git to apply and safe the rejects? Well, you can use patch -p1 ... directly, and manually add the files it created to the object cache.

Re: Linus kernel tree corrupt?

2005-07-10 Thread Petr Baudis
Dear diary, on Sat, Jul 09, 2005 at 08:03:32PM CEST, I got a letter where H. Peter Anvin [EMAIL PROTECTED] told me that... Petr Baudis wrote: Yes, please do. I deprecated rsync a day before Linus broke http-pull. It's un-deprecated again for now in the latest Cogito. Presumably

Re: New script: cg-clean

2005-07-10 Thread Petr Baudis
Dear diary, on Sat, Jul 09, 2005 at 12:34:44AM CEST, I got a letter where Pavel Roskin [EMAIL PROTECTED] told me that... Hello, Petr! Hello, Please consider this script for Cogito. Signed-off-by: Pavel Roskin [EMAIL PROTECTED] the script is definitively interesting, but I have couple of

Re: [ANNOUNCE] Cogito-0.12

2005-07-08 Thread Petr Baudis
Dear diary, on Fri, Jul 08, 2005 at 02:09:48AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Thu, 7 Jul 2005, Linus Torvalds wrote: cg-update from a local repo that contains packs is broken though :-( Is this with cg-0.12? The most recent release

Re: [ANNOUNCE] Cogito-0.12

2005-07-07 Thread Petr Baudis
Dear diary, on Wed, Jul 06, 2005 at 02:01:38PM CEST, I got a letter where Brian Gerst [EMAIL PROTECTED] told me that... Petr Baudis wrote: Also, I've deprecated rsync, as I explained in another mail. Use cg-branch-chg to change the branch URLs to some more sensible scheme - most likely HTTP

Re: BUG: rpmbuild -ta cogito-0.12.tar.gz fails

2005-07-07 Thread Petr Baudis
Dear diary, on Wed, Jul 06, 2005 at 08:40:00PM CEST, I got a letter where John Ellson [EMAIL PROTECTED] told me that... rpmbuild -ta cogito-0.12.tar.gz fails because cogito.spec.in refers to .bz2 in its Source: line, instead of to .gz. (FYI, cogito.spec.in is Chris' sole teritorry in Cogito, so

  1   2   >