# Re: Linux 2.6.12-rc3 5 messages from 2005-04-21 to 2005-04-23. Participants: Petr Baudis, Pavel Machek. Thread: https://gitlist.dev/t/228 ## Petr Baudis, 2005-04-21 19:09 Subject: Re: Linux 2.6.12-rc3 Message-ID: <20050421190956.GA7443@pasky.ji.cz> URL: https://gitlist.dev/e/20050421190956.GA7443%40pasky.ji.cz In-Reply-To: <20050421190009.GC475@openzaurus.ucw.cz> ``` Dear diary, on Thu, Apr 21, 2005 at 09:00:09PM CEST, I got a letter where Pavel Machek 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?) > > > > 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, 2005-04-21 21:38 Subject: Re: Linux 2.6.12-rc3 Message-ID: <20050421213811.GA31207@elf.ucw.cz> URL: https://gitlist.dev/e/20050421213811.GA31207%40elf.ucw.cz In-Reply-To: <20050421190956.GA7443@pasky.ji.cz> ``` 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. > > 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? > > 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, 2005-04-21 21:41 Subject: Re: Linux 2.6.12-rc3 Message-ID: <20050421214119.GO7443@pasky.ji.cz> URL: https://gitlist.dev/e/20050421214119.GO7443%40pasky.ji.cz In-Reply-To: <20050421213811.GA31207@elf.ucw.cz> ``` Dear diary, on Thu, Apr 21, 2005 at 11:38:11PM CEST, I got a letter where Pavel Machek told me that... > 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.) > > > 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, 2005-04-21 22:30 Subject: Re: Linux 2.6.12-rc3 Message-ID: <20050421223020.GB31207@elf.ucw.cz> URL: https://gitlist.dev/e/20050421223020.GB31207%40elf.ucw.cz In-Reply-To: <20050421214119.GO7443@pasky.ji.cz> ``` 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. :^) Well, this will be really short and really kernel oriented. > > > 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, 2005-04-23 21:31 Subject: Re: Linux 2.6.12-rc3 Message-ID: <20050423213143.GA4978@elf.ucw.cz> URL: https://gitlist.dev/e/20050423213143.GA4978%40elf.ucw.cz In-Reply-To: <20050421190956.GA7443@pasky.ji.cz> ``` 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?) > > > > > > 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. ```