Skip to content

Commit

Permalink
Changes line endings to LF.
Browse files Browse the repository at this point in the history
We are using a `.gitattributes` file which dictates that
`Cake/Console/cake.bat` should be in CRLF format. However that
conversion must be done "client-side" and so GIT normalizes
line endings to LF on the source/remote repository.

`Cake/Console/cake.bat` was still in CRLF format in the repository
causing a problem when checking out the branch on a fresh clone.

The problem was reproduced on several computers, with different
Linux distributions and git versions:

- Mint 15 Olivia - GIT 1.8.1.2
- Debian 7 Wheezy - GIT 1.7.10 and 1.8.4.2
- Ubuntu 12.04 LTS Precise - GIT 1.7.9.5

So in conclusion we were using `.gitattributes` in the wrong way
and this commit corrects that, making it possible again to simply
checkout the branch without GIT indicating any changes.
  • Loading branch information
Phally committed Nov 9, 2013
1 parent d75423b commit 598a0ec
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions Cake/Console/cake.bat
@@ -1,31 +1,31 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: Bake is a shell script for running CakePHP bake script
:: PHP 5
::
:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
:: Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
::
:: Licensed under The MIT License
:: Redistributions of files must retain the above copyright notice.
::
:: @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
:: @link http://cakephp.org CakePHP(tm) Project
:: @since CakePHP(tm) v 1.2.0.5012
:: @license http://www.opensource.org/licenses/mit-license.php MIT License
::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

:: In order for this script to work as intended, the cake\console\ folder must be in your PATH

@echo.
@echo off

SET app=%0
SET lib=%~dp0

php -q "%lib%cake.php" -working "%CD% " %*

echo.

exit /B %ERRORLEVEL%
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
::
:: Bake is a shell script for running CakePHP bake script
:: PHP 5
::
:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
:: Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
::
:: Licensed under The MIT License
:: Redistributions of files must retain the above copyright notice.
::
:: @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
:: @link http://cakephp.org CakePHP(tm) Project
:: @since CakePHP(tm) v 1.2.0.5012
:: @license http://www.opensource.org/licenses/mit-license.php MIT License
::
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

:: In order for this script to work as intended, the cake\console\ folder must be in your PATH

@echo.
@echo off

SET app=%0
SET lib=%~dp0

php -q "%lib%cake.php" -working "%CD% " %*

echo.

exit /B %ERRORLEVEL%

0 comments on commit 598a0ec

Please sign in to comment.