[PATCH] Use sq_quote() to properly quote the parameter to call shell.

2005-07-08 Thread Junio C Hamano
This tries to be more lenient to the users and stricter to the attackers by quoting the input properly for shell safety, instead of forbidding certain characters from the input. Things to note: - We do not quote "prog" parameter (which comes from --exec). The user should know what he is doing

pack-e3117bbaf6a59cb53c3f6f0d9b17b9433f0e4135.pack

2005-07-08 Thread Alexey Dobriyan
Being a happy user of $ cat ./rsync-linus #!/bin/sh -x cd linux-linus rsync -avz --progress \ rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/ \ .git/ I'm confused now. This pack file is ~60M in size. Will

Re: Stacked GIT 0.3 (now more Quilt-like)

2005-07-08 Thread Peter Osterlund
Junio C Hamano <[EMAIL PROTECTED]> writes: > > "PO" == Peter Osterlund <[EMAIL PROTECTED]> writes: > > PO> I think it would be good if it was possible to include diffstat output > PO> in exported patches, something like this: > > PO> Added possibility to include diffstat output in exported p

Re: [ANNOUNCE] Cogito-0.12

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

Re: pack-e3117bbaf6a59cb53c3f6f0d9b17b9433f0e4135.pack

2005-07-08 Thread Ryan Anderson
On Fri, Jul 08, 2005 at 11:49:45AM +0400, Alexey Dobriyan wrote: > Being a happy user of > > $ cat ./rsync-linus > #!/bin/sh -x > > cd linux-linus > rsync -avz --progress \ > > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/ \ >

Re: Stacked GIT 0.3 (now more Quilt-like)

2005-07-08 Thread Catalin Marinas
Peter Osterlund <[EMAIL PROTECTED]> wrote: > Added possibility to include diffstat output in exported patches. Great. I had a plan to do this but I was busy with the push and resolved commands. I will apply this patch. Thanks. -- Catalin - To unsubscribe from this list: send the line "unsubscr

[PATCH] add --no-check option to git-write-tree

2005-07-08 Thread Bryan Larsen
Add --no-check option to git-write-tree. Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]> --- Documentation/git-write-tree.txt |6 ++ write-tree.c | 14 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/Documentation/git-write-tree.txt

patches to support working without the object database

2005-07-08 Thread Bryan Larsen
Sometimes you may wish to keep an audit trail of what changed, where, and by whom. You do not need to know the exact details of the change, and the files are so large that keeping an extra copy of the data in the object database cache is prohibitively expensive. Git is (almost) ideally suited

[PATCH] 4/7 Use SHA1 for git-update-cache --refresh

2005-07-08 Thread Bryan Larsen
Change git-update-cache --refresh behaviour to use sha1's rather than comparing byte by byte. Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]> --- update-cache.c | 31 +-- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/update-cache.c b/update-cach

[PATCH] 3/7 Add --info-only option to git-update-cache.

2005-07-08 Thread Bryan Larsen
Add --info-only option to git-update-cache. Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]> --- Documentation/git-update-cache.txt | 23 +++ update-cache.c | 14 +++--- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/Document

[PATCH] 7/7 add -N option to cg-init

2005-07-08 Thread Bryan Larsen
add -N option to cg-init Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]> --- cg-init | 22 +++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/cg-init b/cg-init --- a/cg-init +++ b/cg-init @@ -10,13 +10,29 @@ # # If `cg-init` is run in a non-empty director

[PATCH] 2/7 Prepare for the next two patches

2005-07-08 Thread Bryan Larsen
Prepare for the next two patches. This patch makes the first half of write_sha1_file() and index_fd() externally visible. The first half of these two functions is basically just an SHA1 calculation, so there is probably a better way to do this. However, doing things this way makes this patch

[PATCH] 6/7 Add the -N option to cg-commit.

2005-07-08 Thread Bryan Larsen
Add the -N option to cg-commit. Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]> --- cg-commit | 15 --- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cg-commit b/cg-commit --- a/cg-commit +++ b/cg-commit @@ -39,6 +39,10 @@ # the tree is the same as the l

[PATCH] 5/7 Add the -N option to cg-add.

2005-07-08 Thread Bryan Larsen
Add the -N option to cg-add. Signed-off-by: Bryan Larsen <[EMAIL PROTECTED]> --- cg-add | 21 ++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/cg-add b/cg-add --- a/cg-add +++ b/cg-add @@ -13,20 +13,35 @@ # is that 'Cogito' manages content and empty dir

git and commiting

2005-07-08 Thread Mateusz Berezecki
Hi list readers, How to commit and check-in changes done to the checked-out source code? The "git commit" command seems to only commit the changes locally without pushing them via rsync. Is there any way I can push commits via rsync? Am I missing the point and git commit is not enough? please CC

Re: Updated git HOWTO for kernel hackers

2005-07-08 Thread Amin Azez
Thanks for the HOWTO, Jeff, but it gives me problems in step 4. I checked out your latest git source today and "make install"ed it as part of your instructions and at step 4 I get: $ git checkout -f error: cannot map sha1 file f8640c306db2d583b9a30f2e52f8fb0a4cf624e0 fatal: failed to unpack tre

Linus kernel tree corrupt?

2005-07-08 Thread Jon Smirl
What happened in this session... [EMAIL PROTECTED] linus]$ cg update 11:52:32 URL:http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.g it/refs/heads/master [41/41] -> "refs/heads/origin" [1] progress: 34 objects, 102329 bytes error: File 9cd17004869977026b473030ebb5b6fb71bfcebf (htt

Re: [ANNOUNCE] Cogito-0.12

2005-07-08 Thread Daniel Barkalow
On Fri, 8 Jul 2005, Petr Baudis wrote: > It seems like the whole pull family is totally borked now, and I'm > getting desperate. Looks like this evening will be *pull.c fixing for > me. > > Jul 04 Daniel Barkalow [PATCH 0/2] Support for transferring pack files in > git-ssh-* > > is what brings

Re: Linus kernel tree corrupt?

2005-07-08 Thread Tony Luck
On 7/8/05, Jon Smirl <[EMAIL PROTECTED]> wrote: > What happened in this session... Linus has "packed" his GIT tree ... and now http-pull doesn't work. rsync still does (provided you have a new enough cogito). -Tony - To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Please rename t/t6000-lib.sh - it gets run as test

2005-07-08 Thread Pavel Roskin
Hello! t/t6000-lib.sh has a bad name - it matches the wildcard for tests and gets run by "make test". The only side effect is an empty file named t/sed.script. This is pretty benign, but let's fix it. I suggest renaming t6000-lib.sh to t6000.lib.sh but I'll be happy with any other name that doe

Re: Please rename t/t6000-lib.sh - it gets run as test

2005-07-08 Thread Chris Wright
* Pavel Roskin ([EMAIL PROTECTED]) wrote: > I suggest renaming t6000-lib.sh to t6000.lib.sh but I'll be happy with > any other name that doesn't match t[0-9][0-9][0-9][0-9]-*.sh It's already been renamed to t6000lib.sh in current git repo. thanks, -chris - To unsubscribe from this list: send the

Re: patches to support working without the object database

2005-07-08 Thread Junio C Hamano
> "BL" == Bryan Larsen <[EMAIL PROTECTED]> writes: BL> Sometimes you may wish to keep an audit trail of what changed, where, BL> and by whom. You do not need to know the exact details of the change, BL> and the files are so large that keeping an extra copy of the data in BL> the object databa

Re: [PATCH] add --no-check option to git-write-tree

2005-07-08 Thread Linus Torvalds
On Fri, 8 Jul 2005, Bryan Larsen wrote: > > Add --no-check option to git-write-tree. I like almost all of these patches (well, the ones relevant to core git, I'll not speak for Pasky on cogito), although I'd actually prefer your "index_fd()" info-only flag to work the other way around: make it a

Re: pack-e3117bbaf6a59cb53c3f6f0d9b17b9433f0e4135.pack

2005-07-08 Thread Linus Torvalds
On Fri, 8 Jul 2005, Alexey Dobriyan wrote: > > I'm confused now. This pack file is ~60M in size. Will rsync download > another 60M next time? What command should I use now to a) get latest and > greatest and b) be nice with my traffic? Your existing command should work fine. You may (or may no

Re: git and commiting

2005-07-08 Thread Linus Torvalds
On Fri, 8 Jul 2005, Mateusz Berezecki wrote: > > How to commit and check-in changes done to the checked-out source code? > The "git commit" command seems to only commit the changes locally > without pushing them via rsync. > Is there any way I can push commits via rsync? Am I missing the point >

Re: patches to support working without the object database

2005-07-08 Thread Bryan Larsen
Junio C Hamano wrote: "BL" == Bryan Larsen <[EMAIL PROTECTED]> writes: BL> Sometimes you may wish to keep an audit trail of what changed, where, BL> and by whom. You do not need to know the exact details of the change, BL> and the files are so large that keeping an extra copy of the data in B

Bootstrapping into git, commit gripes at me

2005-07-08 Thread Marc Singer
In working through a usage example on my way to producing bonafide patches, I've found that commit is complaining. Here's what I've done. o Fetched and built cogito-0.12 o Fetched (rsync) Linus' tree o Created a working directory, linux-2.6 o linked .git in the working directory to the .g

Re: New script: cg-clean

2005-07-08 Thread Wolfgang Denk
In message <[EMAIL PROTECTED]> Pavel Roskin wrote: > > Please consider this script for Cogito. ... > # OPTIONS > # --- > # -i:: > # Clean files ignored by cg-status, such as object files. May I suggest to give "-i" the standard "--interactive" meaning (= prompt before removal) like with "

cogito Mac OS X compatibility

2005-07-08 Thread Bryan Larsen
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.git/refs/heads/master [41/41] -> "refs/heads/origin" [1] /Users/blarsen/bin/cg-pull: line 82: 0 + : syntax error: operand expected (e

Re: patches to support working without the object database

2005-07-08 Thread Junio C Hamano
Replying to myself... JCH> While you are at it, you might also want to add an option to JCH> write-blob to specify the type of the object you are hashing, so JCH> that would make [*1*]: JCH> git-write-blob [-n] [-t ] ... JCH> [Footnote] JCH> *1* I considered this instead: JCH> git-writ

arch 2.0 first source available (git related)

2005-07-08 Thread Thomas Lord
The first source release and some very early documentation for Arch 2.0 ("revc") is now ready! Web page: Source: Source (tar bundle) SHA1: 9c279f78e57a99d517ccf5b983960620ff6f2cf7

Re: Bootstrapping into git, commit gripes at me

2005-07-08 Thread Marc Singer
> $ git checkout -f v2.6.11 ;# fixed one > warning: v2.6.11 is not a commit -- not updating your HEAD > $ git commit ;# to have his own baseline at v2.6.11 > $ git-apply --index --stat --summary --apply <../old-patch-file > $ : do the usual tests > $ git commit ;# create a commit based on the

Re: Bootstrapping into git, commit gripes at me

2005-07-08 Thread Marc Singer
On Fri, Jul 08, 2005 at 06:08:52PM -0700, Junio C Hamano wrote: > > "MS" == Marc Singer <[EMAIL PROTECTED]> writes: > > MS> Does this preclude symlinking .git? I'd like to keep one .git which > MS> is mirrored from the net and allow for more than one working > MS> directory. > > I think peop

[PATCH] format-patch: fix skipping of blank-lines

2005-07-08 Thread Junio C Hamano
If it is fed a commit with more than one leading blank lines, the sed scripts git-format-patch-script used looped forever. This patch fixes it. Signed-off-by: Junio C Hamano <[EMAIL PROTECTED]> --- git-format-patch-script | 18 +- 1 files changed, 13 insertions(+), 5 deletions(

Re: Bootstrapping into git, commit gripes at me

2005-07-08 Thread Marc Singer
On Fri, Jul 08, 2005 at 05:17:08PM -0700, Junio C Hamano wrote: > > "MS" == Marc Singer <[EMAIL PROTECTED]> writes: > > MS> In working through a usage example on my way to producing bonafide > MS> patches, I've found that commit is complaining. Here's what I've done. > > MS> o Fetched and

Re: Bootstrapping into git, commit gripes at me

2005-07-08 Thread Junio C Hamano
> "MS" == Marc Singer <[EMAIL PROTECTED]> writes: MS> I gather that the approved solution is to have complete replicas of MS> the git master from Linus for each line of development. Either symlink .git/objects together, or GIT_OBJECT_DIRECTORY environment variable point at a shared repository

Converting commits to patch files? HEAD vs HEAD^

2005-07-08 Thread Marc Singer
Jeff Garzik's guide doesn't appear to explain how to get patches back out of the system. I've successfully commited a set of changes. # git diff HEAD^ HEAD This command will produce a diff of the changes I've made. What is the HEAD^? Does it refer to the commit before the last one made? If

Re: [PATCH] format-patch: fix skipping of blank-lines

2005-07-08 Thread Linus Torvalds
On Fri, 8 Jul 2005, Junio C Hamano wrote: > > If it is fed a commit with more than one leading blank lines, > the sed scripts git-format-patch-script used looped forever. > This patch fixes it. How about using "git-stripspace"? That's what it's there for. It strips whitespace from the end of lin

Re: Bootstrapping into git, commit gripes at me

2005-07-08 Thread Linus Torvalds
On Fri, 8 Jul 2005, Marc Singer wrote: > > In working through a usage example on my way to producing bonafide > patches, I've found that commit is complaining. Here's what I've done. > > o Fetched and built cogito-0.12 > o Fetched (rsync) Linus' tree > o Created a working directory, linux

Re: Converting commits to patch files? HEAD vs HEAD^

2005-07-08 Thread Linus Torvalds
On Fri, 8 Jul 2005, Marc Singer wrote: > > # git diff HEAD^ HEAD > > This command will produce a diff of the changes I've made. What is > the HEAD^? Does it refer to the commit before the last one made? Yes. The core tools don't understand this syntax, but most of the helper scripts use "gi

[PATCH] format-patch: fix skipping of blank-lines (take 2)

2005-07-08 Thread Junio C Hamano
If it is fed a commit with more than one leading blank lines, the sed scripts git-format-patch-script used looped forever. Using git-stripspace upfront makes the sed script somewhat simpler to work around this problem. Also use git-rev-parse so that we can say $ git-format-patch-script HEAD^^

Re: Converting commits to patch files? HEAD vs HEAD^

2005-07-08 Thread Junio C Hamano
> "MS" == Marc Singer <[EMAIL PROTECTED]> writes: MS> If I've made several commits, I'd like to be able to gather several MS> together and produce a patch file. Better still, I'd like to be able MS> to pick a set of discontiguous commits an bundle them into a single MS> patch. Ought I be usi