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 m

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

2013-06-30 Thread Petr Baudis
changes. > -- >8 -- > From: Petr Baudis > 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 cas

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

2013-06-28 Thread Petr Baudis
it reset --hard` is assumed 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 --- Please Cc me, I'm currently not subscribed on the list. Documentati

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-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.

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 contai

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 ov

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. > >

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

2013-04-05 Thread Petr Baudis
On Fri, Apr 05, 2013 at 11:57:19AM -0700, Junio C Hamano wrote: > Petr Baudis writes: > >> > -if (defined $opts{STDERR}) { > >> > -close STDERR; > >> > -} > >

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 In general, Acked-by: Petr Baudis On Thu, Apr 04, 2013 at 07:21:23AM +, Eri

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 fr

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

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 o

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 hav

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 wha

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

2005-08-13 Thread Petr Baudis
by another 41 bytes; 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-pa

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 > > in

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.

Re: Add an empty directory?

2005-08-13 Thread Petr Baudis
Dear diary, on Sat, Aug 13, 2005 at 07:30:43PM CEST, I got a letter where Carl Baldwin <[EMAIL PROTECTED]> told me that... > Greetings, Hi, > My appologies if this has already been discussed. I've been through the > archives but could easily have missed something. > > I have found it useful in

[HUP] Pulling broken by late Cogito commits

2005-08-13 Thread Petr Baudis
Hi, if you are following Cogito development closely, please note that pulling over HTTP and SSH was broken by a late Cogito commit (74b4f7). This also means that you won't be able to pull the fix (which I just committed and might take a short while to mirror out) if you pull Cogito over HTTP.

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 conflicti

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 02:10:53PM CEST, I got a letter where Sergey Vlasov <[EMAIL PROTECTED]> told me that... > However, cg-export is buggy - if you use the second argument > (cg-export DESTFILE TREE_ID), the resulting tar file is different > from what git-tar-tree produces for the sa

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 ob

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 > > r

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, e

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: [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) >

[PATCH] Fix documentation installation

2005-08-12 Thread Petr Baudis
all target 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]

Re: [PATCH] Clean generated files a bit more.

2005-08-12 Thread Petr Baudis
Dear diary, on Fri, Aug 12, 2005 at 11:41:34AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Also attempt to build a source package for debian. > --- > > Makefile |4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > b263f24ce4f12dd39cfcd922c56a322

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 41f10531f1

Re: Bootstrapping into git, commit gripes at me

2005-08-11 Thread Petr Baudis
Dear diary, on Tue, Jul 12, 2005 at 06:48:50PM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > Then "cg-seek" and "cg-unseek" would continue to work, but the core git > layer would never be confused because they're really using normal > branches? That makes sense,

Re: New script: cg-clean

2005-08-11 Thread Petr Baudis
to wait until > you apply my 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: > >

Re: New script: cg-clean

2005-08-11 Thread Petr Baudis
Dear diary, on Sat, Aug 06, 2005 at 09:14:03AM CEST, I got a letter where Pavel Roskin <[EMAIL PROTECTED]> told me that... > Hello, Petr! Hello, > Sorry for delay. no problem, and sorry for another delay on my side too. :-) > On Sun, 2005-07-10 at 17:46 +0200, Petr Baudi

Re: [PATCH] cg-cat [was: Re: Newbie question: equiv of: cvs co -p ? ]

2005-08-11 Thread Petr Baudis
Dear diary, on Wed, Aug 10, 2005 at 04:38:08PM CEST, I got a letter where John Ellson <[EMAIL PROTECTED]> told me that... > Linus Torvalds wrote: > > > >On Tue, 9 Aug 2005, John Ellson wrote: > > > >>I hacked this: > > >No. ... > > >So you could do something like ... > > >(totally untested) > >

git-http-pull broken in latest git

2005-08-11 Thread Petr Baudis
Dear diary, on Tue, Aug 09, 2005 at 06:06:10PM CEST, I got a letter where Dirk Behme <[EMAIL PROTECTED]> told me that... > Hello, Hello, > >cg-clone http://www.kernel.org/pub/scm/git/git.git > defaulting to local storage area > warning: templates not found /home/user/share/git-core/templates/ >

Re: Make git-rev-tree obsolete

2005-08-11 Thread Petr Baudis
Dear diary, on Tue, Aug 09, 2005 at 04:49:26AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Johannes Schindelin <[EMAIL PROTECTED]> writes: > > > Junio remarked that Jeff's git-changes-script still uses git-rev-tree, and > > therefore it should not be removed. T

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

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 co

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

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 wa

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 S

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 fo

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

[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.

[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. P

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 c

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 > an

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 contai

[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 aef274d1fc04d848c7355a68c3e48c0b2b

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 `/usr/local/BUILD/cogito-

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

[PATCH] Unify Makefile indentation

2005-08-04 Thread Petr Baudis
Use 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

[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]> --- commit ffc29a11e9be157e2349d431adadf1b6e91a2251 tree fbd1076ed78c609777f81094cb8989b5b329

[PATCH] Kill $COPTS in favour of $CFLAGS

2005-08-04 Thread Petr Baudis
As proposed on the mailing list previously, remove the seemingly obscure $COPTS usage in favour of a default $CFLAGS value, which is a more usual usage. Signed-off-by: Petr Baudis <[EMAIL PROTECTED]> --- commit 3e90b732f2c1c5d6b3b460be0c17cd24f3932ce

[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 25c4f9cabd6db8c92ab1b0313093d89

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 ad

Re: Status of git.git repository

2005-08-04 Thread Petr Baudis
Dear diary, on Sat, Jul 30, 2005 at 04:11:48AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > By the way, do people mind my posting my own patches to the > list? I keep the same in the "pu" (proposed updates) branch, so > if the list readers think I am just adding

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

Re: git-local-pull?

2005-08-04 Thread Petr Baudis
Dear diary, on Wed, Aug 03, 2005 at 07:11:00PM CEST, I got a letter where [EMAIL PROTECTED] told me that... > IIRC, git-local-pull still doesn't work for a packed source repository, > because it doesn't include the possibility of copying a pack (or > extracting an object) if the requested object

git: problems in read-only trees

2005-08-04 Thread Petr Baudis
Dear diary, on Wed, Aug 03, 2005 at 09:42:41AM CEST, I got a letter where Wolfgang Denk <[EMAIL PROTECTED]> told me that... > Hello, > > sometimes I have to work in trees for which I have only read > permissions; cogito has problems then - for example: > > -> cg-diff > fatal: unable to

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-m

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 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 h

[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 Ba

[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

[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 656a66fe63898954dbc40854dd049dc76eb9b84

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

2005-07-29 Thread Petr Baudis
anges 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 Pe

[PATCH 5/2] Remove the explicit Makefile dependencies description

2005-07-29 Thread Petr Baudis
Remove about one gazillion of explicit dependency rules with few lines describing the general dependency pattern and then the exceptions. This noticably shortens the Makefile and makes it easier to touch it. This is part of the Cogito Makefile changes port. Signed-off-by: Petr Baudis <[EM

Makefile: COPTS vs CFLAGS

2005-07-29 Thread Petr Baudis
Hello, one more thing - should we keep the $COPTS variable? Most projects (including Cogito) have the C flags controlled by the $CFLAGS variable. What I would propose: -COPTS=-g -O2 -CFLAGS=$(COPTS) -Wall +CFLAGS?=-g -O2 +CFLAGS+=-Wall That is, if user do

[PACKAGERS] Makefile: DESTDIR vs. dest

2005-07-29 Thread Petr Baudis
Hello, git has $dest in its Makefile while Cogito uses $DESTDIR. I'd like to ask the potential users of those variables (probably mostly distribution package maintainers) what's easier for them and what do they prefer, as I would like to unify this. Thanks, --

[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 <[EM

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 > > whe

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 12:57:50PM CEST, I got a letter where Johannes Schindelin <[EMAIL PROTECTED]> told me that... > Hi, Hello, > On Fri, 29 Jul 2005, Petr Baudis wrote: > > > You might get the push access rather lately in the process (this "lazy

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

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 10:54:07AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > I however still suspect that you might be spreading chaos under the > name of more flexibility. I'm such a villain! ;-)) > The fact that you can push into it by definitio

[PATCH 2/2] Unify usage strings declaration

2005-07-29 Thread Petr Baudis
All usage strings are now declared as static const char []. This is carried over from my old git-pb branch. Signed-off-by: Petr Baudis <[EMAIL PROTECTED]> --- commit 1e02de8f49a8fca696b3cb363545fad3c98fd662 tree feee1ccdea90d33fae2bf41621a876c5aa2ecfe5

[PATCH 1/2] Trivial tidyups

2005-07-29 Thread Petr Baudis
Simple whitespace-related tidyups ensuring style consistency. This is carried over from my old git-pb branch. Signed-off-by: Petr Baudis <[EMAIL PROTECTED]> --- commit 83b1762040b111b4736d108cd91b8a9d75aad3a9 tree e07192546e9bd6a972e3945dd941fc7a29ec1a4b

[PATCH 0/2] Bits from git-pb

2005-07-29 Thread Petr Baudis
Hi, those two bits were long kept local to git-pb. You can either apply the patches or pull: www.kernel.org/pub/scm/cogito/git-pb.git The bits are mostly cosmetic but I want to get rid of them. :-) I'd like to know what to do with the git-pb branch in the future. Based on what do

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-restor

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 fi

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 09:48:57AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Petr Baudis <[EMAIL PROTECTED]> writes: > > > Aha, so it seems our problem is hopefully only in terminology, great. > > > > So, what d

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 nee

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

2005-07-29 Thread Petr Baudis
Dear diary, on Fri, Jul 29, 2005 at 07:04:36AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > * When checking a file to see if it is excluded, we first look >at "exclude-from patterns" list, then "per directory >patterns" list, and then "command line patter

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 debu

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, ref->o

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. Th

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

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 abo

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 > >

Unnamed branches

2005-07-28 Thread Petr Baudis
Dear diary, on Thu, Jul 28, 2005 at 08:53:56PM CEST, I got a letter where Josef Weidendorfer <[EMAIL PROTECTED]> told me that... > So why not put the name of the remote repository into the local branch name? > A remote branch "host1:path#branch1" could be named "host1:path#branch1". > The shorthand

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 06:52:45PM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Petr Baudis <[EMAIL PROTECTED]> writes: > > > AFAIK the plan is to centralize all the kernel repositories to a single > > one. For that, d

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 06:14:17PM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > My gut feeling is that Johannes is right here, at least about > the send-pack side. Storing "master" pulled from a remote under > a name different from the remote is a dif

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 > >>

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

2005-07-28 Thread Petr Baudis
Hello, after skimming through it, I think I completely like what you have shown here. I'm only concerned about this: Dear diary, on Mon, Jul 25, 2005 at 12:49:33AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > $ cat Documentation/.gitignore > # ignore

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 02:08:07PM CEST, I got a letter where Petr Baudis <[EMAIL PROTECTED]> told me that... > See above. I would much rather see more flexible git-send-pack. Junio, > what about changing its [heads]* parameter e.g. to > [remotehead[:localhead]]* ? Ok,

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 03:07:01PM CEST, I got a letter where Johannes Schindelin <[EMAIL PROTECTED]> told me that... > Hi, Hello, > On Thu, 28 Jul 2005, Petr Baudis wrote: > > > See above. I would much rather see more flexible git-send-pack. Junio, > &

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

2005-07-28 Thread Petr Baudis
Dear diary, on Wed, Jul 27, 2005 at 02:58:42PM CEST, I got a letter where Josef Weidendorfer <[EMAIL PROTECTED]> told me that... > Hi, Hello, > if I clone a remote head other than master via Cogito with > > cg-clone host:path#remoteHead, > > work on this branch, and try to push back my ch

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 i

Re: Handover, Make

2005-07-28 Thread Petr Baudis
Dear diary, on Thu, Jul 28, 2005 at 01:08:03AM CEST, I got a letter where Brian O'Mahoney <[EMAIL PROTECTED]> told me that... > First, congratulations Junio, on taking over this stuff, and all the best. > > Second, the killer argument, in the 'Recursive Make ... harmful' is the > basic one that Re

  1   2   3   4   >