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

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

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: Re: Re: Merge with git-pasky II.

2005-04-14 Thread Petr Baudis
Dear diary, on Thu, Apr 14, 2005 at 10:23:26PM CEST, I got a letter where Erik van Konijnenburg [EMAIL PROTECTED] told me that... On Thu, Apr 14, 2005 at 09:35:07PM +0200, Petr Baudis wrote: Hmm. I actually don't like this naming. I think it's not too consistent, is irregular, therefore

Re: Re: Naming the SCM (was Re: Handling renames.)

2005-04-14 Thread Petr Baudis
Dear diary, on Thu, Apr 14, 2005 at 10:58:52PM CEST, I got a letter where H. Peter Anvin [EMAIL PROTECTED] told me that... Petr Baudis wrote: Cogito. Git inside can be the first slogan. What about tig? I like Cogito; it's a real name, plus it'd be a good use for the otherwise-pretty

Re: Misc fixes for git-pasky

2005-04-14 Thread Petr Baudis
Dear diary, on Fri, Apr 15, 2005 at 12:37:57AM CEST, I got a letter where Pavel Roskin [EMAIL PROTECTED] told me that... Hi, Petr! The attached patch against current git-pasky does following: Hum. It does too much at once, that means I cannot apply it easily. :-( * README: spell checked

Re: update gitcancel.sh to handle modes as well

2005-04-14 Thread Petr Baudis
Dear diary, on Fri, Apr 15, 2005 at 12:57:25AM CEST, I got a letter where Martin Schlemmer [EMAIL PROTECTED] told me that... Hi, gitcancel.sh do not handle mode changes: $ chmod -x Makefile $ git cancel patch: Only garbage was found in the patch input. Rather use

Re: Remove need to untrack before tracking new branch

2005-04-14 Thread Petr Baudis
Dear diary, on Fri, Apr 15, 2005 at 01:01:27AM CEST, I got a letter where Martin Schlemmer [EMAIL PROTECTED] told me that... On Fri, 2005-04-15 at 00:42 +0200, Petr Baudis wrote: Dear diary, on Thu, Apr 14, 2005 at 11:40:09AM CEST, I got a letter where Martin Schlemmer [EMAIL PROTECTED] told

Re: Reorganize common code

2005-04-14 Thread Petr Baudis
Dear diary, on Thu, Apr 14, 2005 at 12:00:25AM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... This splits read-cache.c into util.c, cache.c, and objects.c, based on what the code is used for; similarly, cache.h becomes util.h, cache.h, and objects.h. For

Re: Re: Merge with git-pasky II.

2005-04-14 Thread Petr Baudis
Dear diary, on Fri, Apr 15, 2005 at 01:12:34AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... PB == Petr Baudis [EMAIL PROTECTED] writes: PB What I would like your script to do is therefore just do the PB merge in a given already prepared (including built index

Re: Re: Re: [patch pasky] update gitcancel.sh to handle modes as well

2005-04-14 Thread Petr Baudis
Dear diary, on Fri, Apr 15, 2005 at 01:39:06AM CEST, I got a letter where Martin Schlemmer [EMAIL PROTECTED] told me that... On Fri, 2005-04-15 at 01:15 +0200, Petr Baudis wrote: Dear diary, on Fri, Apr 15, 2005 at 01:04:50AM CEST, I got a letter where Martin Schlemmer [EMAIL PROTECTED] told

Re: Re: Re: write-tree is pasky-0.4

2005-04-15 Thread Petr Baudis
Dear diary, on Fri, Apr 15, 2005 at 10:13:21PM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Fri, 15 Apr 2005, Petr Baudis wrote: So, I assume that you don't want to merge my SCM layer (which is perfectly fine by me). However, I also apply plenty

Re: Add clone support to lntree

2005-04-15 Thread Petr Baudis
Dear diary, on Sat, Apr 16, 2005 at 03:56:03AM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... I often want to take a base tree, which I keep tracking some remote head, and make a local working tree that starts from it. This makes git ln -c dest give you a tree that

Re: Re: Re: Add clone support to lntree

2005-04-16 Thread Petr Baudis
Dear diary, on Sat, Apr 16, 2005 at 05:16:12AM CEST, I got a letter where Linus Torvalds [EMAIL PROTECTED] told me that... On Sat, 16 Apr 2005, Petr Baudis wrote: I'm wondering, whether each tree should be fixed to a certain branch. I'm wondering why you talk about branches at all

Re: git-pasky file mode handling

2005-04-16 Thread Petr Baudis
Dear diary, on Sat, Apr 16, 2005 at 11:45:59AM CEST, I got a letter where Russell King [EMAIL PROTECTED] told me that... Hi, Hello, It seems that there's something weird going on with the file mode handling. Firstly, some files in the git-pasky repository have mode 0664 while others have

Re: Re: SHA1 hash safety

2005-04-16 Thread Petr Baudis
Dear diary, on Sat, Apr 16, 2005 at 04:58:15PM CEST, I got a letter where C. Scott Ananian [EMAIL PROTECTED] told me that... On Sat, 16 Apr 2005, Brian O'Mahoney wrote: (1) I _have_ seen real-life collisions with MD5, in the context of Document management systems containing ~10^6 ms-WORD

Re: Re: full kernel history, in patchset format

2005-04-16 Thread Petr Baudis
Dear diary, on Sat, Apr 16, 2005 at 09:23:40PM CEST, I got a letter where Thomas Gleixner [EMAIL PROTECTED] told me that... One remark on the tree blob storage format. The binary storage of the sha1sum of the refered object is a PITA for scripting. Converting the ASCII - binary for the

Re: Re: Re: full kernel history, in patchset format

2005-04-16 Thread Petr Baudis
Dear diary, on Sat, Apr 16, 2005 at 08:32:32PM CEST, I got a letter where Petr Baudis [EMAIL PROTECTED] told me that... Dear diary, on Sat, Apr 16, 2005 at 09:23:40PM CEST, I got a letter where Thomas Gleixner [EMAIL PROTECTED] told me that... One remark on the tree blob storage format

Re: Re: Add clone support to lntree

2005-04-16 Thread Petr Baudis
Dear diary, on Sat, Apr 16, 2005 at 05:06:54AM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... On Sat, 16 Apr 2005, Petr Baudis wrote: I'm sorry but you are late, I added it about a hour and half ago or so. :-) Check git fork. (I *want* separate command than git

Re: Re: Re: Add clone support to lntree

2005-04-16 Thread Petr Baudis
Dear diary, on Sat, Apr 16, 2005 at 05:17:00AM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... On Sat, 16 Apr 2005, Petr Baudis wrote: Dear diary, on Sat, Apr 16, 2005 at 04:47:55AM CEST, I got a letter where Petr Baudis [EMAIL PROTECTED] told me

Re: fix mktemp (remove mktemp ;)

2005-04-16 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 01:27:43AM CEST, I got a letter where Paul Jackson [EMAIL PROTECTED] told me that... Remove mktemp usage - it doesn't work on some Mandrakes, nor on my SuSE 8.2 with mktemp-1.5-531. Replace with simple use of $$ (pid). I've been using this same pattern

Re: optimize gitdiff-do script

2005-04-16 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 01:28:04AM CEST, I got a letter where Paul Jackson [EMAIL PROTECTED] told me that... Reduce number of subcommands execv'd by a third, by only calling 'rm' once, at end, not each loop. The idea behind that was that diffing could take a significant portion of

Re: Re: Re: Add clone support to lntree

2005-04-16 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 01:07:35AM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... Actually, what about if git pull outside of repository did what git clone does now? I'd kinda like clone instead of fork too. This seems like the best solution to me,

[PATCH] Fix +x-related show-diff false positives

2005-04-17 Thread Petr Baudis
Hi, the following patch fixes show-diff listing all +x files as differring. Signed-off-by: Petr Baudis [EMAIL PROTECTED] --- read-cache.c +++ read-cache.c2005-04-17 13:42:13.322938268 +0200 @@ -306,7 +306,7 @@ ce-ce_gid != htonl(st-st_gid)) changed

Re: Add lsremote command.

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 07:36:51AM CEST, I got a letter where Steven Cole [EMAIL PROTECTED] told me that... This is a fairly trivial addition, but if users are adding remote repositories with git addremote, then those users should be able to list out the remote list without having

Re: Parsing code in revision.h

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 05:24:20PM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... This adds support to revision.h for parsing commit records (but not going any further than parsing a single record). Something like this is needed by anything that uses

Re: Re: Re-done kernel archive - real one?

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 05:24:48PM CEST, I got a letter where Russell King [EMAIL PROTECTED] told me that... However, I've made a start to generate the necessary emails. How about this format? I'm not keen on the tree, parent, author and committer objects appearing in this -

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

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 05:35:19PM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... Index: checkout-cache.c === --- 157b46ce1d82b3579e2e1258927b0d9bdbc033ab/checkout-cache.c (mode:100644

Re: [3/5] Add http-pull

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 05:31:16PM CEST, I got a letter where Daniel Barkalow [EMAIL PROTECTED] told me that... http-pull is a program that downloads from a (normal) HTTP server a commit and all of the tree and blob objects it refers to (but not other commits, etc.). Options could

Re: Re-done kernel archive - real one?

2005-04-17 Thread Petr Baudis
Dear diary, on Sun, Apr 17, 2005 at 08:13:59PM CEST, I got a letter where David A. Wheeler [EMAIL PROTECTED] told me that... On Sun, 17 Apr 2005, Russell King wrote: BTW, there appears to be errors in the history committed thus far. I'm not sure where this came from though. Some of them could

Re: Yet another base64 patch

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

Re: [3/5] Add http-pull

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

Re: [3/5] Add http-pull

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

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

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

Re: [2.1/5] Add merge-base

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

Re: Re-done kernel archive - real one?

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

Re: Merge with git-pasky II.

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

Re: full kernel history, in patchset format

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

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

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

Re: full kernel history, in patchset format

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

Re: full kernel history, in patchset format

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

Re: Merge with git-pasky II.

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

Re: full kernel history, in patchset format

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

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

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

Re: [pasky] recent changes to gitdiff.sh

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

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

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

Re: Re-done kernel archive - real one?

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

Re: Re-done kernel archive - real one?

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

Re: optimize gitdiff-do script

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

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

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

Re: Add + Status patches

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

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

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

[ANNOUNCE] git-pasky-0.5

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

Re: Add + Status patches

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

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

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

Re: Re-done kernel archive - real one?

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

Re: Re-done kernel archive - real one?

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

Re: SCSI trees, merges and git status

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

Re: Re-done kernel archive - real one?

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

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

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

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

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

Re: [2/4] Sorting commits by date

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

Re: [2/4] Sorting commits by date

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

Re: [PATCH] Automerge fix

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

Re: True git merge in git-pasky

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

Re: More git pull problems

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

Re: More git pull problems

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

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

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

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

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

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

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

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

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

Re: [script] ge: export commits as patches

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

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

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

Re: [script] ge: export commits as patches

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

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

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

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

2005-04-19 Thread Petr Baudis
Dear diary, on Wed, Apr 20, 2005 at 12:45:02AM CEST, I got a letter where Junio C Hamano [EMAIL PROTECTED] told me that... PB == Petr Baudis [EMAIL PROTECTED] writes: PB I'm wondering if doing PB if [ $(show-diff) ]; then PB git diff | git apply PB else PB checkout-cache -f -a PB

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

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

Re: git-viz tool for visualising commit trees

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

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

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

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

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

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

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

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

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

Re: Git hangs while executing commit-tree

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Re: [PATCH] Improve usage messages

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

Re: Switching between branches

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

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

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

Re: git-viz tool for visualising commit trees

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

Re: Linux 2.6.12-rc3

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

Re: Pasky problem with 'git init URL'

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

  1   2   3   >