threads / discuss / 228

Re: Linux 2.6.12-rc3

Subject: Re: Linux 2.6.12-rc3

## tl;dr

5 messages between Apr 21, 2005 and Apr 23, 2005.

replies: 4people: 2as markdown or json

Petr Baudis· Apr 21, 2005, 19:09 UTC · lore

Dear diary, on Thu, Apr 21, 2005 at 09:00:09PM CEST, I got a letter where Pavel Machek <pavel@ucw.cz> told me that...

> Hi!
Hi,
Show 17 quoted lines
> > > 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?)
> > 
> > No. git cancel does what it says - cancels your local changes to the
> > working tree. git track will only set that next time you pull from
> > linus, the changes will be automatically merged. (Note that this will
> > change with the big UI change.)
> 
> Is there way to say "forget those changes in my repository, I want
> just plain vanilla" without rm -rf?

git cancel will give you "plain last commit". If you need plain vanilla, the "hard way" now is to just do

	commit-id >.git/HEAD
but your current HEAD will be lost forever. Or do
	git fork vanilla ~/vanilla linus
and you will have the vanilla tree tracking linus in ~/vanilla.

I'm not yet sure if we should have some Cogito interface for doing this and what its semantics should be.

> I see quite a lot of problems with fsck-tree. Is that normal?
> (I ran out of disk space few times during different operations...)

Actually, in case your tree is older than about two days, I hope you did the convert-cache magic or fetched a fresh tree?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
Pavel Machek· Apr 21, 2005, 21:38 UTC · re: Petr Baudis · lore
Hi!

It seems that someone should write "Kernel hacker's guide to git"... Documentation/git.txt seems like good place. I guess I'll do it.

Show 12 quoted lines
> > just plain vanilla" without rm -rf?
> 
> git cancel will give you "plain last commit". If you need plain vanilla,
> the "hard way" now is to just do
> 
> 	commit-id >.git/HEAD
> 
> but your current HEAD will be lost forever. Or do
> 
> 	git fork vanilla ~/vanilla linus
> 
> and you will have the vanilla tree tracking linus in ~/vanilla.
Ok, thanks.
> I'm not yet sure if we should have some Cogito interface for doing this
> and what its semantics should be.
What is Cogito, BTW?
Show 5 quoted lines
> > I see quite a lot of problems with fsck-tree. Is that normal?
> > (I ran out of disk space few times during different operations...)
> 
> Actually, in case your tree is older than about two days, I hope you did
> the convert-cache magic or fetched a fresh tree?
No, I did not anything like that. I guess it is rm -rf time, then...
									Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.
Petr Baudis· Apr 21, 2005, 21:41 UTC · re: Pavel Machek · lore

Dear diary, on Thu, Apr 21, 2005 at 11:38:11PM CEST, I got a letter where Pavel Machek <pavel@ucw.cz> told me that...

Show 5 quoted lines
> Hi!
> 
> It seems that someone should write "Kernel hacker's guide to
> git"... Documentation/git.txt seems like good place. I guess I'll do
> it.

I've also started writing some tutorial-like guide to Cogito on my notebook, but I have time for that only during lectures. :^)

> > I'm not yet sure if we should have some Cogito interface for doing this
> > and what its semantics should be.
> 
> What is Cogito, BTW?

New name for git-pasky. Everyone will surely rejoice as the usage will change significantly. But better let's clean it up now.

(For more details, check git@ archives for git-pasky-0.6 announcement.)
Show 7 quoted lines
> > > I see quite a lot of problems with fsck-tree. Is that normal?
> > > (I ran out of disk space few times during different operations...)
> > 
> > Actually, in case your tree is older than about two days, I hope you did
> > the convert-cache magic or fetched a fresh tree?
> 
> No, I did not anything like that. I guess it is rm -rf time, then...
That's the root of all your problems then.
-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
Pavel Machek· Apr 21, 2005, 22:30 UTC · re: Petr Baudis · lore
Hi!
Show 6 quoted lines
> > It seems that someone should write "Kernel hacker's guide to
> > git"... Documentation/git.txt seems like good place. I guess I'll do
> > it.
> 
> I've also started writing some tutorial-like guide to Cogito on my
> notebook, but I have time for that only during lectures. :^)
Well, this will be really short and really kernel oriented.
Show 10 quoted lines
> > > I'm not yet sure if we should have some Cogito interface for doing this
> > > and what its semantics should be.
> > 
> > What is Cogito, BTW?
> 
> New name for git-pasky. Everyone will surely rejoice as the usage will
> change significantly. But better let's clean it up now.
> 
> (For more details, check git@ archives for git-pasky-0.6
> announcement.)

I liked git, and git-pasky did not seem too wrong, either... I did google search for cogito, and there are several companies named that way, and some are software-related. git was bad name, but cogito seems bad, too. I'd stick with git.

								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.
Pavel Machek· Apr 23, 2005, 21:31 UTC · re: Petr Baudis · lore
Hi!
Show 28 quoted lines
> > > > 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?)
> > > 
> > > No. git cancel does what it says - cancels your local changes to the
> > > working tree. git track will only set that next time you pull from
> > > linus, the changes will be automatically merged. (Note that this will
> > > change with the big UI change.)
> > 
> > Is there way to say "forget those changes in my repository, I want
> > just plain vanilla" without rm -rf?
> 
> git cancel will give you "plain last commit". If you need plain vanilla,
> the "hard way" now is to just do
> 
> 	commit-id >.git/HEAD
> 
> but your current HEAD will be lost forever. Or do
> 
> 	git fork vanilla ~/vanilla linus
> 
> and you will have the vanilla tree tracking linus in ~/vanilla.

Yep, symlinked in nice way. Good trap; it cought me ;-). (I of course deleted the original directory).

> I'm not yet sure if we should have some Cogito interface for doing this
> and what its semantics should be.
Perhaps "git init" is right command for this? Running it in non-empty
directory for faster restart after bad problem....
								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.

← back to recent threads