Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #1212: Added missing .gitignore files to the application generated by WebAppCommand #1482

Merged
merged 5 commits into from Sep 27, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -14,6 +14,7 @@ Version 1.1.13 work in progress
- Bug #962: Fixed handling of negative timestamps in CDateFormatter::format() (johnmendonca) - Bug #962: Fixed handling of negative timestamps in CDateFormatter::format() (johnmendonca)
- Bug #1095: Added missing retry_interval parameter of addServer function call in CMemCache (Lisio) - Bug #1095: Added missing retry_interval parameter of addServer function call in CMemCache (Lisio)
- Bug #1181: Fixed can read but not save binary data e.g. BYTEA on PostgreSQL (karmakaze) - Bug #1181: Fixed can read but not save binary data e.g. BYTEA on PostgreSQL (karmakaze)
- Bug #1212: Added missing .gitignore files to the application generated by WebAppCommand (resurtm)
- Bug #1249: CHttpRequest::sendFile() outputs malformed file content in some specific circumstances (andyhu) - Bug #1249: CHttpRequest::sendFile() outputs malformed file content in some specific circumstances (andyhu)
- Bug #1330: SQLite column default value was incorrect for column of type string and DEFAULT NULL (cebe) - Bug #1330: SQLite column default value was incorrect for column of type string and DEFAULT NULL (cebe)
- Bug #1344: Fixed URL problem in CGridView when enableHistory was true and unicode chars where used (mdomba, Redjik) - Bug #1344: Fixed URL problem in CGridView when enableHistory was true and unicode chars where used (mdomba, Redjik)
Expand Down
10 changes: 5 additions & 5 deletions framework/cli/commands/WebAppCommand.php
Expand Up @@ -77,16 +77,16 @@ public function run($args)
switch($vcs) switch($vcs)
{ {
case 'git': case 'git':
$renameMap=array('git.gitignore'=>'.gitignore','git.gitkeep'=>'.gitkeep'); // move with rename git files $renameMap=array('git-gitignore'=>'.gitignore','git-gitkeep'=>'.gitkeep'); // move with rename git files
$ignoreFiles=array('hg.hgignore','hg.hgkeep'); // ignore only hg files $ignoreFiles=array('hg-hgignore','hg-hgkeep'); // ignore only hg files
break; break;
case 'hg': case 'hg':
$renameMap=array('hg.hgignore'=>'.hgignore','hg.hgkeep'=>'.hgkeep'); // move with rename hg files $renameMap=array('hg-hgignore'=>'.hgignore','hg-hgkeep'=>'.hgkeep'); // move with rename hg files
$ignoreFiles=array('git.gitignore','git.gitkeep'); // ignore only git files $ignoreFiles=array('git-gitignore','git-gitkeep'); // ignore only git files
break; break;
default: default:
// no files for renaming // no files for renaming
$ignoreFiles=array('git.gitignore','git.gitkeep','hg.hgignore','hg.hgkeep'); // ignore both git and hg files $ignoreFiles=array('git-gitignore','git-gitkeep','hg-hgignore','hg-hgkeep'); // ignore both git and hg files
break; break;
} }
$list=$this->buildFileList($sourceDir,$path,'',$ignoreFiles,$renameMap); $list=$this->buildFileList($sourceDir,$path,'',$ignoreFiles,$renameMap);
Expand Down
Expand Up @@ -4,3 +4,4 @@ syntax: regexp
# ignore all except .hgkeep # ignore all except .hgkeep
assets/(?!.*\.hgkeep$).+ assets/(?!.*\.hgkeep$).+
protected/runtime/(?!.*\.hgkeep$).+ protected/runtime/(?!.*\.hgkeep$).+
protected/tests/report/(?!.*\.hgkeep$).+
@@ -0,0 +1,2 @@
*
!.gitignore
Empty file.