Re: Git 1.0 Synopis (Draft v4)

2005-08-14 Thread Ryan Anderson
On Sun, Aug 14, 2005 at 10:19:18PM -0700, Junio C Hamano wrote: > Ryan Anderson <[EMAIL PROTECTED]> writes: > > > Junio, do you want to pull this into the git tree? > > Yes, but I have been wondering where it should go. Should it go > under Documentation/ and made into html via asciidoc along wi

Re: [PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-14 Thread Martin Langhoff
On 8/15/05, Martin Langhoff <[EMAIL PROTECTED]> wrote: > [PATCH] Add -k kill keyword expansion option to git-cvsimport Bad patch! Please ignore while I fix and resend... apologies. martin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTEC

[PATCH] Add -k kill keyword expansion option to git-cvsimport

2005-08-14 Thread Martin Langhoff
[PATCH] Add -k kill keyword expansion option to git-cvsimport Early versions of git-cvsimport defaulted to using preexisting keyword expansion settings. This change preserves compatibility with existing cvs imports and allows new repository migrations to kill keyword expansion. Should improve our

Re: sending changesets from the middle of a git tree

2005-08-14 Thread Ryan Anderson
On Sun, Aug 14, 2005 at 12:02:33AM -0400, Ryan Anderson wrote: > On Sat, Aug 13, 2005 at 10:35:50PM -0500, Steve French wrote: > > > 2) There is no way to update the comment field of a changeset after it > > goes in (e.g. to add a bugzilla bug number for a bug that was opened > > just after the f

Re: Git 1.0 Synopis (Draft v4)

2005-08-14 Thread Junio C Hamano
Ryan Anderson <[EMAIL PROTECTED]> writes: > Junio, do you want to pull this into the git tree? Yes, but I have been wondering where it should go. Should it go under Documentation/ and made into html via asciidoc along with other tools? - To unsubscribe from this list: send the line "unsubscrib

Re: symlinked directories in refs are now unreachable

2005-08-14 Thread Junio C Hamano
Matt Draisey <[EMAIL PROTECTED]> writes: > The behaviour of the symlinked in ref directories has changed from > earlier versions of git. They used to be taken into account in > git-fsck-cache --unreachable. > > Can the previous behaviour be reinstated? I would not have much problem accepting a p

Re: Git 1.0 Synopis (Draft v4)

2005-08-14 Thread Ryan Anderson
Add a SYNOPSIS/release summary to the tree. Signed-off-by: Ryan Anderson <[EMAIL PROTECTED]> diff --git a/SYNOPSIS b/SYNOPSIS new file mode 100644 --- /dev/null +++ b/SYNOPSIS @@ -0,0 +1,93 @@ +Source Code Management with git + +In Linus's own words as the creator of git: +"git" can mean anythin

Re: [PATCH] Debian packaging for 0.99.4

2005-08-14 Thread Ryan Anderson
On Sun, Aug 14, 2005 at 02:11:50AM +0200, Matthias Urlichs wrote: > Hi, > > Ryan Anderson: > > > > #!/bin/sh > > echo "Don't get a git - use gt! > Ouch. :) I meant it as a joke, obviously. I also thinkoed the sentence I was aiming for, thus losing the humor. Oh well. > > echo "Do

Git 1.0 Synopis (Draft v4)

2005-08-14 Thread Ryan Anderson
On Sun, Jul 31, 2005 at 06:15:40PM -0400, Horst von Brand wrote: > Ryan Anderson <[EMAIL PROTECTED]> wrote: > > Source Code Management with Git > > More bugging... Ok, I think I've got all this addressed (plus the other email). It just took me a lot longer to get to it than I planned. Junio, do

Re: symlinked directories in refs are now unreachable

2005-08-14 Thread Linus Torvalds
On Mon, 15 Aug 2005, Matt Draisey wrote: > > The behaviour of the symlinked in ref directories has changed from > earlier versions of git. Hmm.. There used to be a mix of lstat() (in receive-pack) and stat() (in fsck-cache.c, and it got standardized in one function which used lstat. The reason

Re: Switching heads and head vs branch after CVS import

2005-08-14 Thread Linus Torvalds
On Mon, 15 Aug 2005, Martin Langhoff wrote: > > > So in a cvsimport, you'll never see a merge back to the head, even if one > > technically took place. > > There may be some surprises in here! gitk --all shows at least one > branch opening and merging back into origin, and it has figured it out

symlinked directories in refs are now unreachable

2005-08-14 Thread Matt Draisey
The behaviour of the symlinked in ref directories has changed from earlier versions of git. They used to be taken into account in git-fsck-cache --unreachable. The code in question would simply stat the contents of .git/refs and recursively expand any S_ISDIR. Now the code does an lstat and effe

Re: Switching heads and head vs branch after CVS import

2005-08-14 Thread Martin Langhoff
> Just do > > git checkout branch-name > > to switch between them. thanks! I was doing cg-branch-chg branch-name and it wasn't working. > So in a cvsimport, you'll never see a merge back to the head, even if one > technically took place. There may be some surprises in here! gitk --all

Re: [PATCH] Alternate object pool mechanism updates.

2005-08-14 Thread Junio C Hamano
Linus Torvalds <[EMAIL PROTECTED]> writes: > I think this is great - especially for places like kernel.org, where a lot > of repos end up being related to each other, yet independent. Yes. There is one shortcoming in the current git-clone -s in the proposed updates branch. If the parent reposi

Re: sending changesets from the middle of a git tree

2005-08-14 Thread Junio C Hamano
Petr Baudis <[EMAIL PROTECTED]> writes: > 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: >> >> > Junio, maybe you want to talk about how you move patches from your "pu" >

Re: Switching heads and head vs branch after CVS import

2005-08-14 Thread Linus Torvalds
On Mon, 15 Aug 2005, Martin Langhoff wrote: > > After having done a cvs import of Moodle using git-cvsimport-script > all the cvs branches show up as heads. How do I switch heads within a > checkout? cogito doesn't seem to be able to, and I'm unsure on how to > do it with git. Just do g

Re: Switching heads and head vs branch after CVS import

2005-08-14 Thread Junio C Hamano
Martin Langhoff <[EMAIL PROTECTED]> writes: > After having done a cvs import of Moodle using git-cvsimport-script > all the cvs branches show up as heads. How do I switch heads within a > checkout? cogito doesn't seem to be able to, and I'm unsure on how to > do it with git. The documentation may

Re: [PATCH] Alternate object pool mechanism updates.

2005-08-14 Thread Linus Torvalds
On Sun, 14 Aug 2005, Junio C Hamano wrote: > > Ok, so the one in the proposed updates branch says > info/alternates. > > With this, your recent cg-clone -l can be made to still use > individual .git/object/??/ hierarchy to keep objects newly > created in each repository while sharing the inheri

Switching heads and head vs branch after CVS import

2005-08-14 Thread Martin Langhoff
After having done a cvs import of Moodle using git-cvsimport-script all the cvs branches show up as heads. How do I switch heads within a checkout? cogito doesn't seem to be able to, and I'm unsure on how to do it with git. And I am confused about the difference between heads and branches. Git and

Re: [PATCH] Alternate object pool mechanism updates.

2005-08-14 Thread Junio C Hamano
Petr Baudis <[EMAIL PROTECTED]> writes: > What about calling it rather info/alternates (or info/alternate)? It > looks better, sounds better, is more namespace-ecological tab-completes > fine and you don't type it that often anyway. :-) Ok, so the one in the proposed updates branch says info/alte

Re: (cogito) Branch offf from older commit?

2005-08-14 Thread Linus Torvalds
On Sun, 14 Aug 2005, Wolfgang Denk wrote: > > Is there (in cogito) a way to start a branch off from an older > commit? You should be able to just use the git commands, and cogito should be perfectly happy. IOW, if you do git checkout -b newbranch you'll switch to a "newbranch

(cogito) Branch offf from older commit?

2005-08-14 Thread Wolfgang Denk
Is there (in cogito) a way to start a branch off from an older commit? Assume I receive a patch whichis based on an old version which I want to test first (and resolve problems) in a separate branch. This was what I tried: * Clone main repo: -> cg-clone /git/u-boot u-boot-testing

ImO , we invite You to elite sites with 4 in 1 rOQ

2005-08-14 Thread John Elmond
Hello Git, At this time we can offer a small update at our system - BD-MAGAZINE Issue N1,2,3,4,5! ... When it's late at night , all ya really need is some midnight passion. See a video few sweet young models show fashion for your passion within these pages. Tanya, Marisha, Oksana and Alena.

Re: [ANNOUNCE] qgit-0.9

2005-08-14 Thread Ryan Anderson
On Sun, Aug 14, 2005 at 09:04:19PM +1200, Martin Langhoff wrote: > Marco, > > How do I get this to build on Debian? Not familiar with scons, and it > is complaining that it can't find qt and related header files, when > they are there... You just need to add -I/usr/include/qt3/ in the appropriate

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

2005-08-14 Thread Matthias Urlichs
Hi, Chris Wedgwood wrote: > On Sat, Aug 13, 2005 at 11:47:25PM +0200, Petr Baudis wrote: > >> I think it does not in real setups, since thanks to O_RDWR the >> file should be overwritten only when the write() happens. >> Can a 41-byte write() be non-atomic in any real conditions? >

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: [ANNOUNCE] qgit-0.9

2005-08-14 Thread Martin Langhoff
Marco, How do I get this to build on Debian? Not familiar with scons, and it is complaining that it can't find qt and related header files, when they are there... It's been mentioned on the list that v0.3 didn't build on Debian, but I thought it had been dealt with. There were no fixes mentioned

[PATCH] Add cheap local clone '-s' flag to git-clone-script

2005-08-14 Thread Junio C Hamano
Using the $GIT_OBJECT_DIRECTORY/info/alternates mechanism, create a new repository that borrows objects from the original repository when --shared flag is given in addition to --local. It is worth pointing out that the "cloned" repository depends on the original repository, so this should be used

Re: sending changesets from the middle of a git tree

2005-08-14 Thread Junio C Hamano
Linus Torvalds <[EMAIL PROTECTED]> writes: >> If I export those two changesets as patches, and send them on. >> presumably I lose the changset comments etc. > > Well, you can export them with "git send-email" and you won't be losing > any comments. Yes, except the command is "git format-patch".