From b31052fcdec1e17a50475ac17d0c23d3a263392f Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 15 Apr 2016 16:22:16 +0100 Subject: [PATCH] composer status now includes untracked files in git repos, fixes #2664 --- src/Composer/Command/StatusCommand.php | 2 +- src/Composer/Downloader/GitDownloader.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Composer/Command/StatusCommand.php b/src/Composer/Command/StatusCommand.php index 976e9cb41..d5b483788 100644 --- a/src/Composer/Command/StatusCommand.php +++ b/src/Composer/Command/StatusCommand.php @@ -75,7 +75,7 @@ EOT $errors[$targetDir] = $targetDir . ' is a symbolic link.'; } - if ($changes = $downloader->getLocalChanges($package, $targetDir)) { + if ($changes = $downloader->getLocalChanges($package, $targetDir, true)) { $errors[$targetDir] = $changes; } diff --git a/src/Composer/Downloader/GitDownloader.php b/src/Composer/Downloader/GitDownloader.php index e1eef2a46..d38d707af 100644 --- a/src/Composer/Downloader/GitDownloader.php +++ b/src/Composer/Downloader/GitDownloader.php @@ -97,14 +97,14 @@ class GitDownloader extends VcsDownloader implements DvcsDownloaderInterface /** * {@inheritDoc} */ - public function getLocalChanges(PackageInterface $package, $path) + public function getLocalChanges(PackageInterface $package, $path, $showUntracked = false) { GitUtil::cleanEnv(); if (!$this->hasMetadataRepository($path)) { return; } - $command = 'git status --porcelain --untracked-files=no'; + $command = 'git status --porcelain ' . ($showUntracked ? '' : ' --untracked-files=no'); if (0 !== $this->process->execute($command, $output, $path)) { throw new \RuntimeException('Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput()); }