Re: [PATCH] Add *.rej to .gitignore

[Ingo Molnar]

* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

> On Tue, 17 Feb 2009, Jeremy Fitzhardinge wrote:
> > 
> > (This effectively reverts 1f5d3a6b6532e25a5cdf1f311956b2b03d343a48)
> 
> I really dont' think we should ignore .rej files. 
> 
> They are _error_ cases, after all. People want to know about 
> them. And if you don't want to see them, you should remove 
> them.

hm, ok. Still it would be nice to have some sort of commit-time 
reminder.

I _do_ notice .rej files because i have:

  chmod +x .git/hooks/pre-commit

in my repo and .rej files trigger the checks there.

But the pre-commit hook is pretty painful to use when merging 
upstream updates: in the upstream kernel there's tons of commits 
that scream out loud and i have to commit a second time via 'git 
commit -n'.

I'm still holding out and all the commits we do in our repo are 
.git/hooks/pre-commit-clean, but it's discomforting to see how 
much stuff goes into the kernel with basic problems.

Just do something like this:

   $ chmod +x .git/hooks/pre-commit

   $ git checkout -b tmp.test v2.6.28

   $ git merge --no-ff --no-commit v2.6.29-rc5
   [...]
   Automatic merge went well; stopped before committing as requested

   $ git commit 2>&1 | grep ' (line ' | wc -l
   5334

So 5334 lines with trivial problems were introduced in this 
cycle alone (and that only scratches the surface really) - 
that's about 0.5% of all new lines (we added about 1 million new 
lines in this cycle).

That rate is too high IMO and the noise makes it harder to use 
this tool.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/