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

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: 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: 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-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 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: [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: [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 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-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: 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 > URL:http://www.kernel.org/pub/scm/cogito/cogito.g

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 55

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 cac

Re: [PATCH 1/3] add -N option to cg-add (resent)

2005-07-10 Thread Petr Baudis
Dear diary, on Sat, Jul 09, 2005 at 12:40:22PM CEST, I got a letter where Bryan Larsen <[EMAIL PROTECTED]> told me that... > (resending cogito patches) > > Add the -N option to cg-add. > > Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]> Applied all three patches. Note that I'm a bit happier when

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

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 coupl

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 o

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 <

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

Re: Cogito-0.12: problem with local clone

2005-07-11 Thread Petr Baudis
Dear diary, on Fri, Jul 08, 2005 at 01:00:55AM CEST, I got a letter where Wolfgang Denk <[EMAIL PROTECTED]> told me that... > Hello, Hello, > I have problems with Cogito-0.12 when trying to clone a "local" tree: sorry for the late reply. > When I try to create a local clone I get lots of error

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

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 havi

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 wit

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 exampl

Re: cg update failing

2005-07-19 Thread Petr Baudis
Dear diary, on Fri, Jul 15, 2005 at 06:12:48AM CEST, I got a letter where James Cloos <[EMAIL PROTECTED]> told me that... > Well, it wasn't as Ok as I first thought. There were several .rej and > backup files as left behind by patch(1). cg update HEAD says: Branch > already fully merged but Make

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

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

Re: Is cogito really this inefficient

2005-07-19 Thread Petr Baudis
Dear diary, on Thu, Jul 14, 2005 at 05:26:07PM CEST, I got a letter where Linus Torvalds <[EMAIL PROTECTED]> told me that... > It's quite possible that some path in cg-update ends up not updating the > index properly. For example, I notice that the "fast-forward" uses > "git-checkout-cache -f -a"

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: cg update failing

2005-07-20 Thread Petr Baudis
Dear diary, on Wed, Jul 20, 2005 at 06:34:43AM CEST, I got a letter where James Cloos <[EMAIL PROTECTED]> told me that... > >>>>> "Petr" == Petr Baudis <[EMAIL PROTECTED]> writes: > > Petr> Huh. Well, you had to do uberweird things with your repo

Re: [PATCH 0/6] cogito: compatibility with OS X

2005-07-20 Thread Petr Baudis
Dear diary, on Mon, Jul 18, 2005 at 04:50:31AM CEST, I got a letter where Bryan Larsen <[EMAIL PROTECTED]> told me that... > 3) upload Portfile's along with the .tar.gz's. That's what we do with cogito.spec as well and it's fine. Just send me an appropriate patch for the dist target. > 2 of these

Re: [PATCH] Misc documentation fixes and improvements

2005-07-20 Thread Petr Baudis
s use of cat 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

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 u

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

2005-07-22 Thread Petr Baudis
Dear diary, on Fri, Jul 22, 2005 at 10:39:06PM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Porcelains need to agree on what is placed where and used in > what way. Yes, I always try to make things as Cogito-unspecific as possible. > - Per user. A user may wa

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 ot

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

2005-07-22 Thread Petr Baudis
Dear diary, on Thu, Jul 21, 2005 at 03:10:36PM CEST, I got a letter where "YOSHIFUJI Hideaki / ?$B5HF#1QL@" <[EMAIL PROTECTED]> told me that... > Hello. Hello, > Try all addresses for given remote name until it succeeds. > Also supports IPv6. > > Signed-of-by: Hideaki YOSHIFUJI <[EMAIL PROTECTED

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

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

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

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 patche

git-pb rebased

2005-07-22 Thread Petr Baudis
Hello, I don't expect anyone but myself to actually follow git-pb, but just in case - I rebased it against the latest Linus' HEAD since its history was becoming rather dirty, rusty and generally undesirable to merge for anyone. So if you will try to update, you will end up with tree merge and

Re: Local cg-pull fails

2005-07-22 Thread Petr Baudis
Dear diary, on Thu, Jul 14, 2005 at 12:12:25PM CEST, I got a letter where Russell King <[EMAIL PROTECTED]> told me that... > Last time this was discussed, someone suggested -f, which solved the > problem. Can we please modify the cg-pull script to use -f ? Thanks, done. > Secondly, can I suggest

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

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

2005-07-22 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 01:24:35AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Petr Baudis <[EMAIL PROTECTED]> writes: > > > Cogito shows '[NMD] filename' in place of @[EMAIL PROTECTED] > > Sounds sensible.

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 pr

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

2005-07-23 Thread Petr Baudis
Dear diary, on Sat, Jul 23, 2005 at 01:07:05AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > Catalin Marinas <[EMAIL PROTECTED]> writes: > > > Would such a template only have 'GIT:' prefixed lines? I usually put > > another line like 'Signed-off-by:', for convenie

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

Re: cg-init find error message on empty project directory

2005-07-24 Thread Petr Baudis
Dear diary, on Wed, Jul 13, 2005 at 06:47:43AM CEST, I got a letter where Jerry Seutter <[EMAIL PROTECTED]> told me that... > When I run cg-init on an empty directory, it displays the following output: > > $ cg-init > defaulting to local storage area > find: *: No such file or directory > Committi

Re: Bootstrapping into git, commit gripes at me

2005-07-24 Thread Petr Baudis
Dear diary, on Tue, Jul 12, 2005 at 11:07:43AM CEST, I got a letter where Junio C Hamano <[EMAIL PROTECTED]> told me that... > If you block certain operations while you have seeked to non-top > anyway, wouldn't it be cleaner to have .git/seeked-to that > records the commit ID you are at, which at t

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 wi

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

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

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

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

[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

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

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

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

[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

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

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

[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

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

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

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

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

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

  1   2   3   4   >