From ffd27d2d807644921e9dea6522a9de733291e562 Mon Sep 17 00:00:00 2001
From: Deltik <deltik@gmx.com>
Date: Mon, 19 Nov 2018 15:14:34 -0600
Subject: [PATCH] Deactivated "stash" lock in GitPreparer
The "stash" lock was used to shove .gitignore'd files under the rug
so that they would not interfere with a pure copy of the app.
Vendor files may be ignored in the app, so for performance, the
"stash" lock has been deactivated. Vendor files no longer need to
be downloaded each time the test runs.
The "commit" lock now includes all ignored files so that tests
are run with the files as they are.
---
lib/preparers/GitPreparer.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/preparers/GitPreparer.php b/lib/preparers/GitPreparer.php
index 2282a797e..a1581f22a 100644
--- a/lib/preparers/GitPreparer.php
+++ b/lib/preparers/GitPreparer.php
@@ -32,7 +32,7 @@ class GitPreparer implements Preparer
touch(self::TEST_IN_PROGRESS_FILE);
$this->runCommand('git add -f '.escapeshellarg(self::TEST_IN_PROGRESS_FILE));
- $this->runCommand('git add -A');
+ $this->runCommand('git add -A -f');
$commit_command = 'git commit -a --no-gpg-sign ' .
"-m '".self::TEST_IN_PROGRESS."! If test crashed, run `git log -1` for instructions' " .
@@ -41,7 +41,7 @@ class GitPreparer implements Preparer
$unsetVcsInProgress_commands = [
'git reset --hard HEAD',
'git clean -fdx',
- 'git stash pop',
+// 'git stash pop',
'git reset --mixed HEAD^',
'rm -fv '.escapeshellarg(self::TEST_IN_PROGRESS)
];
@@ -50,7 +50,7 @@ class GitPreparer implements Preparer
$commit_command .= "-m ".escapeshellarg($command)." ";
}
$this->runCommand($commit_command);
- $this->runCommand('git stash push --all -m '.escapeshellarg(self::TEST_IN_PROGRESS));
+// $this->runCommand('git stash push --all -m '.escapeshellarg(self::TEST_IN_PROGRESS));
}
protected function isVcsInProgress($case = '')