From 7187b05b7277b75b54b4cbfa5246bbf2ef875e5f Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sat, 22 Dec 2018 21:30:56 +0100
Subject: [PATCH] #33 Improve handling of git ignore
---
composer.json | 2 +-
src/Handler.php | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/composer.json b/composer.json
index b32dfdf..194263a 100644
--- a/composer.json
+++ b/composer.json
@@ -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"
diff --git a/src/Handler.php b/src/Handler.php
index a58b0ac..d5cc47d 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -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']);
--
GitLab