public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Enable -f flag based on user selection and not only config values, refs #3789

pull/4618/head
Jordi Boggiano 2015-11-18 16:09:47 +00:00
parent 27d51642c8
commit 690c7f572f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Downloader/GitDownloader.php
View File

@ -25,6 +25,7 @@ use Composer\Config;
class GitDownloader extends VcsDownloader class GitDownloader extends VcsDownloader
{ {
private $hasStashedChanges = false; private $hasStashedChanges = false;
private $hasDiscardedChanges = false;
private $gitUtil; private $gitUtil;
public function __construct(IOInterface $io, Config $config, ProcessExecutor $process = null, Filesystem $fs = null) public function __construct(IOInterface $io, Config $config, ProcessExecutor $process = null, Filesystem $fs = null)
@ -204,6 +205,8 @@ class GitDownloader extends VcsDownloader
throw new \RuntimeException("Failed to apply stashed changes:\n\n".$this->process->getErrorOutput()); throw new \RuntimeException("Failed to apply stashed changes:\n\n".$this->process->getErrorOutput());
} }
} }
$this->hasDiscardedChanges = false;
} }
/** /**
@ -218,8 +221,7 @@ class GitDownloader extends VcsDownloader
*/ */
protected function updateToCommit($path, $reference, $branch, $date) protected function updateToCommit($path, $reference, $branch, $date)
{ {
$discardChanges = $this->config->get('discard-changes'); $force = $this->hasDiscardedChanges || $this->hasStashedChanges ? '-f ' : '';
$force = true === $discardChanges || 'stash' === $discardChanges ? '-f ' : '';
// This uses the "--" sequence to separate branch from file parameters. // This uses the "--" sequence to separate branch from file parameters.
// //
@ -317,6 +319,8 @@ class GitDownloader extends VcsDownloader
if (0 !== $this->process->execute('git reset --hard', $output, $path)) { if (0 !== $this->process->execute('git reset --hard', $output, $path)) {
throw new \RuntimeException("Could not reset changes\n\n:".$this->process->getErrorOutput()); throw new \RuntimeException("Could not reset changes\n\n:".$this->process->getErrorOutput());
} }
$this->hasDiscardedChanges = true;
} }
/** /**