Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@piwik.org>2014-12-22 01:11:53 +0300
committersgiehl <stefan@piwik.org>2014-12-22 01:11:53 +0300
commitdbe25a680607ae77bd82d78adc85e167a8544ef2 (patch)
tree98e3a7a751c5a48ff541e778b865172de8d904a5 /plugins/LanguagesManager/Commands
parentceee412a101c9aa6536454a8e1e96bb73e3b1205 (diff)
force checkout to avoid some problems [skip ci]
Diffstat (limited to 'plugins/LanguagesManager/Commands')
-rw-r--r--plugins/LanguagesManager/Commands/CreatePull.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php
index 356f4e213f..bf208ac332 100644
--- a/plugins/LanguagesManager/Commands/CreatePull.php
+++ b/plugins/LanguagesManager/Commands/CreatePull.php
@@ -49,7 +49,7 @@ class CreatePull extends TranslationBase
chdir(PIWIK_DOCUMENT_ROOT);
shell_exec('
- git checkout master > /dev/null 2>&1
+ git checkout -f master > /dev/null 2>&1
git pull > /dev/null 2>&1
git submodule init > /dev/null 2>&1
git submodule update > /dev/null 2>&1
@@ -75,7 +75,7 @@ class CreatePull extends TranslationBase
// switch to branch and update it to latest master
shell_exec('
- git checkout translationupdates > /dev/null 2>&1
+ git checkout -f translationupdates > /dev/null 2>&1
git merge master > /dev/null 2>&1
git push origin translationupdates > /dev/null 2>&1
');