Junio C Hamano wrote:
Andreas Ericsson <ae@xxxxxx> writes:
Junio C Hamano wrote:
The new configuration option apply.whitespace can take one of
"warn", "error", "error-all", or "strip". When git-apply is run
to apply the patch to the index, they are used as the default
value if there is no command line --whitespace option.
I would think "warn-all" would be the logical thing, since "error"
either breaks out early or prints all warnings before denying the
patch anyway.
Actually there is some thinking behind why I did not do warn-all.
I did consider it at first but rejected.
* If you are a busy top echelon person but cares about tree
cleanliness, --whitespace=error is good enough. The patch is
rejected on WS basis whether it introduces one such trailing
WS or hundreds. The patch is returned to the submitter and
the tree remains clean.
* --whitespace=warn-all, if existed, would apply the patch
_anyway_, so if you notice you got warnings, and if that
bothers you enough that you would want to do something about
it, you will have to rewind the HEAD, fix up .dotest/patch
and reapply. This means you are willing to clean up other
peoples' patches.
* But if you are that kind of person, --whitespace=error-all is
a better choice for you. Your tree stays clean and you do
not have to rewind. Instead, you get all the errors you can
go through with your editor (e.g. Emacs users can use C-x `;
I hope vim users have similar macros) and fix things.
Good Thinking. Thanks for explaining.
The last one is somewhat risky, and the output may need to be
examined carefully depending on the contents (e.g. programming
language) the project is dealing with.
echo Makefile >> .git/no-ws-strip
echo '*.[ch]' >> .git/ws-strip
Perhaps not viable, and probably stupid as well. Mixed content repos
would likely just keep the 'warn' policy.
--
Andreas Ericsson andreas.ericsson@xxxxxx
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html