crlf auto-normalization can break export process

[mikjo]

crlf auto-normalization can break export process

[mikjo]

The workaround in 62de793 will cause more error emails to be sent until the problem is fixed, because it will delete the checkout, which will enter a loop:

• Next poll event will find the checkout missing, check it out, and successfully export no changes to CVS (at the cost of a full sync)
• Following poll event will fail the attempt to clean up the checkout, send an error email with the failure, and delete the checkout

This means that there will be one full sync and one error email every two polling cycles until the source repository is fixed to have line termination consistent with the .gitattributes file (or settings in .git/config).

[mikjo]

The real fix in 62de793 is to not try to do a fast-forward merge at all, but to simply reset the HEAD to the branch being tracked, which should entirely remove the error.