Re: [PATCH 0/2] apply.c: a fix and an enhancement

From: Petr Baudis <pasky@suse.cz>
Date: Jul 22, 2005, 23:59 UTC
Message-ID: <20050722235944.GS11916@pasky.ji.cz>
In-Reply-To: <Pine.LNX.4.58.0507221640050.6074@g5.osdl.org>

Dear diary, on Sat, Jul 23, 2005 at 01:50:09AM CEST, I got a letter where Linus Torvalds <torvalds@osdl.org> told me that...

Show 15 quoted lines

> 
> 
> On Sat, 23 Jul 2005, Petr Baudis wrote:
> > 
> > Yes, but this stuff is not for personal preferences. It is for
> > project-wide preferences and policies, which can be still normally
> > overridden or altered locally in each repository.
> 
> What you are describing is a nightmare.
> 
> Let's assume that a user alters the settings locally.
> 
> EVERY SINGLE TIME he does a "cg-commit", those local alterations would get 
> committed, since that config file is part of the same project, and cogito 
> by default commits all changes.

No, no, no. A user does not alter the settings locally in .gitinfo/ - .gitinfo/ is for per-_project_ stuff, not per-user. If user wants an override, he does it per-repository in his .git/conf directory, which is not version-tracked (actually, core GIT does not even let me to).

Show 5 quoted lines

> That's just insane. It means that in practive it's simply not reasonable 
> to have your own local copies of that file. So what would you do? You'd 
> add more and more hacks to cover this up, and have a "commit-ignore" file 
> that ignores the .gitinfo files etc etc. UGLY. All because of a design 
> mistake.

Actually, commit-ignore might be useful in other cases, e.g. when someone (me, a thousand times in the past) needs to keep temporary hacks in the Makefile so that he can actually build the thing on his weird system etc. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox