Skip to content
Snippets Groups Projects
Commit 7187b05b authored by jurgenhaas's avatar jurgenhaas
Browse files

#33 Improve handling of git ignore

parent a810e4d9
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,7 @@
"ext-json": "*",
"php": ">=7.0",
"composer-plugin-api": "^1.0.0",
"lakedrops/composer-json-utils": "^1.3.3",
"lakedrops/composer-json-utils": "^1.4.0",
"lakedrops/docker-traefik": "^1.1.3",
"lakedrops/dotenv": "^1.1.3",
"twig/twig": "^1.23.1"
......
......@@ -105,12 +105,12 @@ class Handler extends BaseHandler {
}
$fs->rename($file, $orig_file);
if (!$orig_ignored) {
$this->git('ignore *.orig');
$this->gitIgnore('*.orig');
$orig_ignored = TRUE;
}
}
else if (empty($def['add2git'])) {
$this->git('ignore ' . $filename);
$this->gitIgnore($filename);
}
file_put_contents($file, $rendered);
}
......@@ -135,8 +135,8 @@ class Handler extends BaseHandler {
}
// Setup BackstopJS.
$this->git('ignore tests/backstop/backstop_data/bitmaps_test');
$this->git('ignore tests/backstop/backstop_data/html_report');
$this->gitIgnore('tests/backstop/backstop_data/bitmaps_test');
$this->gitIgnore('tests/backstop/backstop_data/html_report');
$this->git('lfs track tests/backstop/**/*.png');
$traefik = new Traefik($options['projectname']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment